some more cleanup in server.py