Remove the rest of the water model topics from master branch