ControlServer Cleanup