The dead leg is capped off close to the tank, and yes everything is on mains feed with the cold water tank just servicing the hot water cylinder. The supply to the bathroom is tee'd off the supply to the cold water tank although does bend through two right angles (horizontally not vertically)...