check in new url mapper
code clean up.