Clean up in http.py