Remove the sitemap method and combined the code to be more scale friendly