Cleaned up some redundant client url parsing