Replace server code with simplified version