water cleanup

water cleanup