Removed Referencces to categories as that will be reserved for theme implementation