Remove server and middleware, improve response