Water model simplification, first commit