Code cleanup for SpaceServer