diff --git a/entity/ClassificationAdmin_entity/grantDeleteProcess.js b/entity/ClassificationAdmin_entity/grantDeleteProcess.js
index 8fa84c5634208d4b3bd0ec06ee25e68f752fc700..6a0202d0b06e410bc42a2aa04aef955c32e8c6e5 100644
--- a/entity/ClassificationAdmin_entity/grantDeleteProcess.js
+++ b/entity/ClassificationAdmin_entity/grantDeleteProcess.js
@@ -1,23 +1,8 @@
-import("system.logging");
 import("system.result");
 import("system.db");
 import("system.vars");
 import("Sql_lib");
 
-logging.log(db.cell(SqlCondition.begin()
-                        .andPrepare("CLASSIFICATION.CLASSIFICATIONTYPE_ID", vars.get("$field.CLASSIFICATIONTYPEID"))
-                        .buildSql("select count(*) from CLASSIFICATION", "1=2")))
 result.object(parseInt(db.cell(SqlCondition.begin()
                         .andPrepare("CLASSIFICATION.CLASSIFICATIONTYPE_ID", vars.get("$field.CLASSIFICATIONTYPEID"))
-                        .buildSql("select count(*) from CLASSIFICATION", "1=2"))) <= 0);
-
-//{
-    /*db.deleteData("CLASSIFICATION", "CLASSIFICATION.CLASSIFICATIONTYPE_ID in (" + db.translateStatement(
-                       SqlCondition.begin()
-                                   .andPrepare("CLASSIFICATIONTYPE.SCORETYPE", type)
-                                   .buildSql("select CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID from CLASSIFICATIONTYPE", "1=2")) + ")");
-    db.deleteData("CLASSIFICATIONTYPE", SqlCondition.equals("CLASSIFICATIONTYPE.SCORETYPE", type, "1=2"));
-    db.deleteData("CLASSIFICATIONSCORE", SqlCondition.equals("CLASSIFICATIONSCORE.SCORETYPE", type, "1=2"));*/
-    
-//}
-//neon.refreshAll();
\ No newline at end of file
+                        .buildSql("select count(*) from CLASSIFICATION", "1=2"))) <= 0);
\ No newline at end of file
diff --git a/entity/Classification_entity/Classification_entity.aod b/entity/Classification_entity/Classification_entity.aod
index d31d020aac4df2031669100c15578e2e4d3c0c13..7bc6976a58db9b987ee7130d9886f3d71a082560 100644
--- a/entity/Classification_entity/Classification_entity.aod
+++ b/entity/Classification_entity/Classification_entity.aod
@@ -5,7 +5,6 @@
   <title>Classification</title>
   <grantCreate v="false" />
   <grantDelete v="false" />
-  <grantDeleteProcess>%aditoprj%/entity/Classification_entity/grantDeleteProcess.js</grantDeleteProcess>
   <afterOperatingState>%aditoprj%/entity/Classification_entity/afterOperatingState.js</afterOperatingState>
   <titlePlural>Classifications</titlePlural>
   <recordContainer>jdito</recordContainer>
@@ -61,12 +60,12 @@
     </entityField>
     <entityField>
       <name>CLASSIFICATIONGROUP</name>
+      <title>Group name</title>
       <contentType>TEXT</contentType>
       <groupable v="true" />
       <mandatoryProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationgroup/mandatoryProcess.js</mandatoryProcess>
       <textInputAllowed v="true" />
       <searchable v="false" />
-      <titleProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationgroup/titleProcess.js</titleProcess>
       <displayValueProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationgroup/displayValueProcess.js</displayValueProcess>
     </entityField>
     <entityField>
diff --git a/entity/Classification_entity/entityfields/classificationgroup/mandatoryProcess.js b/entity/Classification_entity/entityfields/classificationgroup/mandatoryProcess.js
index 2fff19b7702bb8390724ad175031c22a0b7d1df9..7bbc5aa02d8beaf00c4458e4297646209f00ad91 100644
--- a/entity/Classification_entity/entityfields/classificationgroup/mandatoryProcess.js
+++ b/entity/Classification_entity/entityfields/classificationgroup/mandatoryProcess.js
@@ -2,4 +2,4 @@ import("system.neon");
 import("system.result");
 import("system.vars");
 
-result.object(vars.get("$param.IsAdminMode_param") == 1 && (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT));
\ No newline at end of file
+result.object(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT);
\ No newline at end of file
diff --git a/entity/Classification_entity/entityfields/classificationgroup/titleProcess.js b/entity/Classification_entity/entityfields/classificationgroup/titleProcess.js
deleted file mode 100644
index 69092d7e4eb7d0499152f2b6c7f91cc0d3352e2b..0000000000000000000000000000000000000000
--- a/entity/Classification_entity/entityfields/classificationgroup/titleProcess.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import("system.neon");
-import("system.translate");
-import("system.vars");
-import("system.result");
-
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.IsAdminMode_param") && vars.exists("$param.IsAdminMode_param") == "1") 
-{
-    result.string(translate.text("Group"));
-}
-else
-{
-    result.string(translate.text("Group name"));
-}
\ No newline at end of file
diff --git a/entity/Classification_entity/grantDeleteProcess.js b/entity/Classification_entity/grantDeleteProcess.js
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000