further cleanup after fixing the ship switching issue