Simplification of server code
README update