url.py cleanup