Removing CategoryTemplateSelector.cs and "Add-ons" from the categories