Oh yeah, didn't catch the year on the tank!!! You'd be best to lose the in-tank pump. My choice would be to get rid of the return line and the vapor canister and use a vented fill cap on the tank, too.