Cleanup URLPattern

Cleanup URLPattern