server.py cleanup