Fixed so only water is removed...again