Implemented naive RemoveCategoryAction and made some changes to the data model.