Fixes: #2483 Reworked ACL categories
Fixes: #2483 Cleaning categories and objectTypes