first pass on cleanup. this runs, revert to it as necessary
final ShipOdyssey cleanup