Removed a thermal expansion tank that was left when new water heater was installed, removed water heater and set in a pan to meet current local code, repaired leak with new CPVC to copper transitions, new ball valves and new brass female adapters, installed thermal expansion tank and secured and finally installed a leak alarm in the new pan.