Cleanup Buoy defs