Clanup from legacy MVC
category and subcategory added