removed old version of server.py that snuck in.
server cleanup, still not tested