some cleanup and preliminary changes before implementing starphleet-jettison