cleaning up water storage