My house is being re-piped by replacing all of the copper with PEX starting at the water service entrance. I'm on a well which is 150' from the house and the service line is CPVC. Currently, there is a ground connected to the copper cold water side of the water heater which connects to the neutral side of the main electrical service panel. There is also a ground to a grounding rod at the service panel.
My question is what to do with the ground connected to the copper at the water heater? I'm assuming it is only there to bond the copper in the house for safety and since all of the copper is being replaced with PEX it is no longer required. The copper wasn't being used as a second ground because the water service to the house has always been plastic to the foundation.