Removed client/server code