clean-up of runserver.py