further Buoy cleanup