I just cleaned the plastic front manifold, the oil will still return but at least you won't get the carbon build up in the (now redundant) EGR valve. I also renewed all the intercooler hoses making sure the long one is no longer rubbing on the front manifold screw and brkt.