Cleaned up the ConnectionId