Removed some dead code
Bug fix in URL matcher