I'm thinking about removing the factory oil cooler, so as I understand it I will need a new shorter union for the remote oil filter which is p/n 15018AA050, also a 2007 2.5i Impreza water pump may be the best (not required) and I will need a block plug but I don't know the p/n for that any one know the p/n ?