More StargateControllerState refactoring