removing dependency on search and sitemap