Ok...i went ahead and deleted the water lines completeley. Damn, the little hoses under the plenum were clogged really bad. No wonder why my intake plenum was always hotter than it should be.

I have also deleted my heater and shaved down the hardline pipes exiting the firewall since I live in Southwest Texas(pretty hot throughout the year) I won't need it whatsoever. I'm not sure how to post pictures since I'll always be replying through my phone. Sorry for this... I would like to add pictures so I'll figure it out soon.