More Cleanup of URLconf