I've got a 10l 2kW water heater that's starting to fail so I'm going to replace it shortly. It was fitted in the early 90s in the days when expansion was absorbed back into the mains. Do I need to fit a non-return valve, expansion vessel etc or can I just swap the water heater out?