Cleaned up urls.py after merge