proxy code cleanup
water implemented