Code cleanup

Removed old code that was not running. Now the scrutcture of server.py
should be more readable if you want to step into development.