Performed a water heater flush on the water heater. Removed and replaced improperly installed gas supply line and sediment trap. Existing thermal expansion tank is full of water and not functioning properly. Installed a new thermal expansion tank and properly secured it to a fixed structure.