Ofwat to be scrapped…finally!