Well I too had the same exact situation as you have. My 84 6 cyl CJ-7 was salvaged from and engine fire so an older mortar was installed w/ the smog pump and pulse air system. From looking at the Hays repair manual the entire vacuum lines and emissions did not make any sense to me. I did some more research in an emission training manual and found out that the Pulse are system replaced the need for a smog pump. So to answer your question if you have all the air pulse system still intact than remove the air pump and air tubes and replace it with the pulse air system per specs. I did this and passed smog in Southern California with flying colors.