Water start in water removement mode fix
code beautification
Water removement on intermittent mode on fix