Cleaned up url mappings