maintain the geometry remove water features