+ remove some bindes
+ relocate water.js to helpers