Some cleanup with the new Fuel System