Removed double delete from bathy and clean up.