Water creation adjustment

Removed useless make water function and added a solid component to the
water.