Help High Idle!!!!!!!!!

MY 1990 BRONCO II IDLES HIGH. IT STARTS AROUND 1800 THEN AS IT WARMS UP IT GOES TO 3000+. I REPLACED IAC MOTOR, AND TPS. WHAT NEXT? IF I UNPLUG THE MAP SENSOR ON THE FIREWALL AND PLUG THE LINE IT DROPS BUT RUNS RICH COULD THIS BE THE PROBLEM? HELP PLEASE!

Hook it up to a vaccum guage. Make sure its within spec. Vaccum leaks can cause a high idle.