deleted waterline validation and unnecessary code