BridgeServer cleaned up