I forgot to mention the metal tube that connects the water pump to the heater tube is only held in with an 8mm bolt and it should just pop out since it is only pressed in. I didn’t replace the o ring on the tube since it was still squishy, but if yours is hard like a rock then replace it.