Bathymetry: saving a lot of cleanup changes