Removed old water code