diff --git a/ccm-core/src/main/java/org/libreccm/categorization/Category.java b/ccm-core/src/main/java/org/libreccm/categorization/Category.java
index 713e6b7b7..e69f58276 100644
--- a/ccm-core/src/main/java/org/libreccm/categorization/Category.java
+++ b/ccm-core/src/main/java/org/libreccm/categorization/Category.java
@@ -18,30 +18,24 @@
  */
 package org.libreccm.categorization;
 
+import static org.libreccm.categorization.CategorizationConstants.*;
+import static org.libreccm.core.CoreConstants.*;
+
 import com.fasterxml.jackson.annotation.JsonIdentityInfo;
 import com.fasterxml.jackson.annotation.JsonIdentityReference;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.ObjectIdGenerators;
-import org.hibernate.validator.constraints.NotBlank;
 import org.libreccm.core.CcmObject;
+import org.libreccm.imexport.Exportable;
 import org.libreccm.l10n.LocalizedString;
 import org.libreccm.security.RecursivePermissions;
 
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 
-import static org.libreccm.categorization.CategorizationConstants.CAT_XML_NS;
-import static org.libreccm.core.CoreConstants.DB_SCHEMA;
-
-import org.libreccm.imexport.Exportable;
-
 import javax.persistence.AssociationOverride;
 import javax.persistence.Column;
 import javax.persistence.Embedded;
@@ -58,6 +52,10 @@ import javax.persistence.NamedQuery;
 import javax.persistence.OneToMany;
 import javax.persistence.OrderBy;
 import javax.persistence.Table;
+import javax.validation.constraints.NotBlank;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlRootElement;
 
 /**
  * The category entity represents a single category. Each category is part of a
@@ -77,59 +75,48 @@ import javax.persistence.Table;
 @NamedQueries({
     @NamedQuery(
         name = "Category.topLevelCategories",
-        query = "SELECT c FROM Category c WHERE c.parentCategory IS NULL")
-    ,
+        query = "SELECT c FROM Category c WHERE c.parentCategory IS NULL"),
     @NamedQuery(
         name = "Category.findByName",
-        query = "SELECT c FROM Category c WHERE c.name = :name")
-    ,
+        query = "SELECT c FROM Category c WHERE c.name = :name"),
     @NamedQuery(
         name = "Category.findByUuid",
-        query = "SELECT c FROM Category c WHERE c.uuid = :uuid")
-    ,
+        query = "SELECT c FROM Category c WHERE c.uuid = :uuid"),
     @NamedQuery(
         name = "Category.findParentCategory",
-        query = "SELECT c.parentCategory FROM Category c WHERE c = :category")
-    ,
+        query = "SELECT c.parentCategory FROM Category c WHERE c = :category"),
     @NamedQuery(
         name = "Category.countAssignedCategories",
         query = "SELECT COUNT(c) FROM Categorization c "
                     + "WHERE c.categorizedObject = :object"
-    )
-    ,
+    ),
     @NamedQuery(
         name = "Category.isCategorized",
         query = "SELECT (CASE WHEN COUNT(c) > 0 THEN true ELSE false END) "
                     + "FROM Categorization c "
-                    + "WHERE c.categorizedObject = :object")
-    ,
+                    + "WHERE c.categorizedObject = :object"),
     @NamedQuery(
         name = "Category.countObjects",
         query = "SELECT COUNT(c) FROM Categorization c "
-                    + "WHERE c.category = :category")
-    ,
+                    + "WHERE c.category = :category"),
     @NamedQuery(
         name = "Category.hasObjects",
         query = "SELECT (CASE WHEN COUNT(c) > 0 THEN true ELSE false END) "
                     + "FROM Categorization c "
-                    + "WHERE c.category = :category")
-    ,
+                    + "WHERE c.category = :category"),
     @NamedQuery(
         name = "Category.countSubCategories",
         query = "SELECT COUNT(c) FROM Category c "
-                    + "WHERE c.parentCategory =:category")
-    ,
+                    + "WHERE c.parentCategory =:category"),
     @NamedQuery(
         name = "Category.hasSubCategories",
         query = "SELECT (CASE WHEN COUNT(c) > 0 THEN true ELSE false END) "
                     + "FROM Category c "
-                    + "WHERE c.parentCategory = :category")
-    ,
+                    + "WHERE c.parentCategory = :category"),
     @NamedQuery(
         name = "Category.findByNameAndParent",
         query = "SELECT c FROM Category c "
-                    + "WHERE c.name = :name AND c.parentCategory = :parent")
-    ,
+                    + "WHERE c.name = :name AND c.parentCategory = :parent"),
     @NamedQuery(
         name = "Category.hasSubCategoryWithName",
         query = "SELECT (CASE WHEN COUNT(c) > 0 THEN true ELSE False END) "
@@ -469,14 +456,14 @@ public class Category extends CcmObject implements Serializable, Exportable {
     public String toString(final String data) {
         return super.toString(String.format(", uniqueId = %s, "
                                                 + "name = \"%s\", "
-//                                                + "title = %s, "
+                                                //                                                + "title = %s, "
                                                 + "enabled = %b, "
                                                 + "visible = %b, "
                                                 + "abstractCategory = %s, "
                                                 + "categoryOrder = %d%s",
                                             uniqueId,
                                             name,
-//                                            Objects.toString(title),
+                                            //                                            Objects.toString(title),
                                             enabled,
                                             visible,
                                             abstractCategory,