Clean up the server part

Commit references #17.