Repealing and Amending Previous Water Legislation