Removing old server code