diff --git a/entity/PermissionAction_entity/PermissionAction_entity.aod b/entity/PermissionAction_entity/PermissionAction_entity.aod
deleted file mode 100644
index 4ab37a7f094bfc2d558ec4afbeabead6d3358907..0000000000000000000000000000000000000000
--- a/entity/PermissionAction_entity/PermissionAction_entity.aod
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>PermissionAction_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <iconId>VAADIN:SHIELD</iconId>
-  <recordContainer>db</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-      <dependencies>
-        <entityDependency>
-          <name>754e3cfc-7bc8-4dfa-a56e-1a4d12570fb2</name>
-          <entityName>PermissionDetail_entity</entityName>
-          <fieldName>PermissionActions</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-    </entityProvider>
-    <entityField>
-      <name>AB_PERMISSIONACTIONID</name>
-      <title>Permission Action</title>
-      <valueProcess>%aditoprj%/entity/PermissionAction_entity/entityfields/ab_permissionactionid/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>AB_PERMISSION_ID</name>
-      <title>Parent Permission Action</title>
-    </entityField>
-    <entityField>
-      <name>ACTION</name>
-      <title>Action</title>
-    </entityField>
-    <entityProvider>
-      <name>PermissionActions</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <recordContainer>db</recordContainer>
-      <dependencies>
-        <entityDependency>
-          <name>504fe751-0e93-4ce3-aed7-26a669fd8ce4</name>
-          <entityName>Permission_entity</entityName>
-          <fieldName>PermissionPermissionActions</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-    </entityProvider>
-    <entityParameter>
-      <name>PermissionId_param</name>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <mandatory v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-  </entityFields>
-  <recordContainers>
-    <dbRecordContainer>
-      <name>db</name>
-      <alias>_____SYSTEMALIAS</alias>
-      <conditionProcess>%aditoprj%/entity/PermissionAction_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
-      <linkInformation>
-        <linkInformation>
-          <name>f73c027f-55f0-4f43-8520-8bd7b4bcbf81</name>
-          <tableName>ASYS_PERMISSIONACTION</tableName>
-          <primaryKey>PERMISSIONACTIONID</primaryKey>
-          <isUIDTable v="false" />
-          <readonly v="false" />
-        </linkInformation>
-      </linkInformation>
-      <recordFieldMappings>
-        <dbRecordFieldMapping>
-          <name>AB_PERMISSION_ID.value</name>
-          <recordfield>AB_PERMISSIONACTION.AB_PERMISSION_ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>AB_PERMISSIONACTIONID.value</name>
-          <recordfield>AB_PERMISSIONACTION.AB_PERMISSIONACTIONID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>ACTION.value</name>
-          <recordfield>AB_PERMISSIONACTION.ACTION</recordfield>
-        </dbRecordFieldMapping>
-      </recordFieldMappings>
-    </dbRecordContainer>
-  </recordContainers>
-</entity>
diff --git a/entity/PermissionAction_entity/entityfields/ab_permissionactionid/valueProcess.js b/entity/PermissionAction_entity/entityfields/ab_permissionactionid/valueProcess.js
deleted file mode 100644
index 11b755b5848286f96ecb1bfe998ec711f663c476..0000000000000000000000000000000000000000
--- a/entity/PermissionAction_entity/entityfields/ab_permissionactionid/valueProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.neon");
-import("system.result");
-import("system.util");
-import("system.vars");
-
-if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
-    result.string(util.getNewUUID());
\ No newline at end of file
diff --git a/entity/PermissionAction_entity/recordcontainers/db/conditionProcess.js b/entity/PermissionAction_entity/recordcontainers/db/conditionProcess.js
deleted file mode 100644
index 10aaf65ee4b3f0a378d22824af5b44eac5f19296..0000000000000000000000000000000000000000
--- a/entity/PermissionAction_entity/recordcontainers/db/conditionProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.db");
-import("system.result");
-
-if (vars.get("$param.PermissionId_param"))
-    result.string(db.translateCondition("ASYS_PERMISSION_ID = '" + vars.get("$param.PermissionId_param") + "'"));
\ No newline at end of file
diff --git a/entity/PermissionAdmin_entity/PermissionAdmin_entity.aod b/entity/PermissionAdmin_entity/PermissionAdmin_entity.aod
deleted file mode 100644
index 1f84089a781507fb1291250ba9603cdc959d6bdf..0000000000000000000000000000000000000000
--- a/entity/PermissionAdmin_entity/PermissionAdmin_entity.aod
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>PermissionAdmin_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <title>Permission Admin</title>
-  <iconId>VAADIN:SHIELD</iconId>
-  <recordContainer>JDito</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-    </entityProvider>
-    <entityField>
-      <name>UID</name>
-    </entityField>
-    <entityConsumer>
-      <name>PermissionSets</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>PermissionSet_entity</entityName>
-        <fieldName>PermissionSets</fieldName>
-      </dependency>
-    </entityConsumer>
-  </entityFields>
-  <recordContainers>
-    <jDitoRecordContainer>
-      <name>JDito</name>
-      <contentProcess>%aditoprj%/entity/PermissionAdmin_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
-      <recordFields>
-        <element>UID.value</element>
-      </recordFields>
-    </jDitoRecordContainer>
-  </recordContainers>
-</entity>
diff --git a/entity/PermissionAdmin_entity/recordcontainers/jdito/contentProcess.js b/entity/PermissionAdmin_entity/recordcontainers/jdito/contentProcess.js
deleted file mode 100644
index ee599add3a511c978b05deb3405295f88221653f..0000000000000000000000000000000000000000
--- a/entity/PermissionAdmin_entity/recordcontainers/jdito/contentProcess.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import("system.result");
-result.object([["0"]])
\ No newline at end of file
diff --git a/entity/PermissionDetail_entity/recordcontainers/jdito/onInsert.js b/entity/PermissionDetail_entity/recordcontainers/jdito/onInsert.js
index 2e3cd82309cff93e3a4c4f923c51c820d4139aa2..4e61ef73b7e33ba304a6d8f30ca098ee7236c014 100644
--- a/entity/PermissionDetail_entity/recordcontainers/jdito/onInsert.js
+++ b/entity/PermissionDetail_entity/recordcontainers/jdito/onInsert.js
@@ -5,6 +5,7 @@ import("system.util");
 import("system.db");
 import("system.vars");
 import("Permission_lib");
+import("Entity_lib");
 
 var table, cols, vals;
 var alias = "_____SYSTEMALIAS";
@@ -67,14 +68,20 @@ function checkInput(pInputArr) {
     return true;
 }
 
-// returns the permission(id) with given parameters, otherwise returns empty string
+// returns permissionid of the permission with fitting parameters, otherwise returns empty string
 function permExists(pRole, pEntity, pField, pAccesstype, pCondtype, pCondition) {
+    var sqlStr = "";
     var sqlExt = "";
-    if (pCondition != null && pCondition != undefined && pCondition != "")
+    
+    if (checkInput([pCondition])) {
         sqlExt += " and COND = '" + pCondition + "'";
-    if (pField != null && pField != undefined && pField != "")
+    }
+    
+    if (checkInput([pField])) {
         sqlExt += " and FIELD_ID = '" + pField + "'";
-    var sqlStr = "select ASYS_PERMISSION.ASYS_PERMISSIONID from ASYS_PERMISSIONSET"
+    }
+    
+    sqlStr = "select ASYS_PERMISSION.ASYS_PERMISSIONID from ASYS_PERMISSIONSET"
     + " join ASYS_PERMISSION on ASYS_PERMISSION.ASYS_PERMISSIONSET_ID = ASYS_PERMISSIONSET.ASYS_PERMISSIONSETID"
     + " where ENTITY_ID = '" + pEntity + "' and ROLE_ID = '" + pRole + "'"
     + " and ACCESSTYPE = '" + pAccesstype + "' and CONDTYPE = '" + pCondtype + "'" + sqlExt;
diff --git a/entity/PermissionSet_entity/PermissionSet_entity.aod b/entity/PermissionSet_entity/PermissionSet_entity.aod
deleted file mode 100644
index e248b5b557c3fe88f174bda25574886ad6074aa8..0000000000000000000000000000000000000000
--- a/entity/PermissionSet_entity/PermissionSet_entity.aod
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>PermissionSet_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <title>Permission Set</title>
-  <contentTitleProcess>%aditoprj%/entity/PermissionSet_entity/contentTitleProcess.js</contentTitleProcess>
-  <iconId>VAADIN:SHIELD</iconId>
-  <recordContainer>db</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-    </entityProvider>
-    <entityField>
-      <name>AB_PERMISSIONSETID</name>
-      <title>Permission Set</title>
-      <valueProcess>%aditoprj%/entity/PermissionSet_entity/entityfields/ab_permissionsetid/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>AB_PERMISSIONSET_ID</name>
-      <title>Parent Permission</title>
-    </entityField>
-    <entityField>
-      <name>ENTITY_ID</name>
-      <title>Entity</title>
-    </entityField>
-    <entityField>
-      <name>ROLE_ID</name>
-      <title>Role</title>
-    </entityField>
-    <entityField>
-      <name>FIELD_ID</name>
-      <title>Field</title>
-    </entityField>
-    <entityField>
-      <name>ACCESSTYPE</name>
-      <title>Access Type</title>
-    </entityField>
-    <entityProvider>
-      <name>PermissionSets</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <dependencies>
-        <entityDependency>
-          <name>fb648b04-2815-42b6-a63a-188d26f39955</name>
-          <entityName>PermissionAdmin_entity</entityName>
-          <fieldName>PermissionSets</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-    </entityProvider>
-    <entityConsumer>
-      <name>Permissions</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Permission_entity</entityName>
-        <fieldName>Permissions</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>PermissionSetId_param</name>
-          <valueProcess>%aditoprj%/entity/PermissionSet_entity/entityfields/permissions/children/permissionsetid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-  </entityFields>
-  <recordContainers>
-    <dbRecordContainer>
-      <name>db</name>
-      <alias>_____SYSTEMALIAS</alias>
-      <linkInformation>
-        <linkInformation>
-          <name>85886d1e-c26d-48ac-93fc-ff06c24ba8a3</name>
-          <tableName>ASYS_PERMISSIONSET</tableName>
-          <primaryKey>PERMISSIONSETID</primaryKey>
-          <isUIDTable v="false" />
-          <readonly v="false" />
-        </linkInformation>
-      </linkInformation>
-      <recordFieldMappings>
-        <dbRecordFieldMapping>
-          <name>AB_PERMISSIONSET_ID.value</name>
-          <recordfield>AB_PERMISSIONSET.AB_PERMISSIONSET_ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>AB_PERMISSIONSETID.value</name>
-          <recordfield>AB_PERMISSIONSET.AB_PERMISSIONSETID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>ACCESSTYPE.value</name>
-          <recordfield>AB_PERMISSIONSET.ACCESSTYPE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>ENTITY_ID.value</name>
-          <recordfield>AB_PERMISSIONSET.ENTITY_ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>FIELD_ID.value</name>
-          <recordfield>AB_PERMISSIONSET.FIELD_ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>ROLE_ID.value</name>
-          <recordfield>AB_PERMISSIONSET.ROLE_ID</recordfield>
-        </dbRecordFieldMapping>
-      </recordFieldMappings>
-    </dbRecordContainer>
-  </recordContainers>
-</entity>
diff --git a/entity/PermissionSet_entity/contentTitleProcess.js b/entity/PermissionSet_entity/contentTitleProcess.js
deleted file mode 100644
index cf6c802b90a0c12278ab252aba5b7f1af09f3731..0000000000000000000000000000000000000000
--- a/entity/PermissionSet_entity/contentTitleProcess.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import("system.vars");
-import("system.result");
-
-var res = "";
-
-switch (vars.get("$field.ACCESSTYPE")) {
-    case "E":
-        res += vars.get("$field.ENTITY_ID");
-        break;
-    case "R":
-        res += "Record";
-        break;
-    case "F":
-        res += vars.get("$field.FIELD_ID");
-        break;
-}
-
-result.string(res);
\ No newline at end of file
diff --git a/entity/PermissionSet_entity/entityfields/ab_permissionsetid/valueProcess.js b/entity/PermissionSet_entity/entityfields/ab_permissionsetid/valueProcess.js
deleted file mode 100644
index 099961e8eac8ab65338d5205add7b7b0401acb2f..0000000000000000000000000000000000000000
--- a/entity/PermissionSet_entity/entityfields/ab_permissionsetid/valueProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.neon");
-import("system.result");
-import("system.util");
-import("system.vars");
-
-if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
-    result.string(util.getNewUUID());
diff --git a/entity/PermissionSet_entity/entityfields/permissions/children/permissionsetid_param/valueProcess.js b/entity/PermissionSet_entity/entityfields/permissions/children/permissionsetid_param/valueProcess.js
deleted file mode 100644
index 75cc39f22364c97ce32192a1d0c354b7c9b2e27b..0000000000000000000000000000000000000000
--- a/entity/PermissionSet_entity/entityfields/permissions/children/permissionsetid_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("system.vars");
-
-result.string(vars.get("$field.AB_PERMISSIONSETID"));
\ No newline at end of file
diff --git a/entity/Permission_entity/Permission_entity.aod b/entity/Permission_entity/Permission_entity.aod
deleted file mode 100644
index 87b91b6d71e1b93ab77d5a66da525aac5664e4e3..0000000000000000000000000000000000000000
--- a/entity/Permission_entity/Permission_entity.aod
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>Permission_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <iconId>VAADIN:SHIELD</iconId>
-  <recordContainer>db</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-    </entityProvider>
-    <entityField>
-      <name>AB_PERMISSIONID</name>
-      <title>Permission</title>
-      <valueProcess>%aditoprj%/entity/Permission_entity/entityfields/ab_permissionid/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>AB_PERMISSIONSET_ID</name>
-      <title>Parent Permission</title>
-    </entityField>
-    <entityField>
-      <name>COND</name>
-      <title>Condition</title>
-    </entityField>
-    <entityField>
-      <name>CONDTYPE</name>
-      <title>Condition Type</title>
-    </entityField>
-    <entityConsumer>
-      <name>PermissionPermissionActions</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>PermissionAction_entity</entityName>
-        <fieldName>PermissionActions</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>PermissionId_param</name>
-          <valueProcess>%aditoprj%/entity/Permission_entity/entityfields/permissionpermissionactions/children/permissionid_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-          <mandatory v="false" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityProvider>
-      <name>Permissions</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <recordContainer>db</recordContainer>
-      <dependencies>
-        <entityDependency>
-          <name>f902d1b2-15c4-4fbc-93c4-17f76625e746</name>
-          <entityName>PermissionSet_entity</entityName>
-          <fieldName>Permissions</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-    </entityProvider>
-    <entityParameter>
-      <name>PermissionSetId_param</name>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <mandatory v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-  </entityFields>
-  <recordContainers>
-    <dbRecordContainer>
-      <name>db</name>
-      <alias>_____SYSTEMALIAS</alias>
-      <conditionProcess>%aditoprj%/entity/Permission_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
-      <linkInformation>
-        <linkInformation>
-          <name>a2c1ed85-8827-47dc-ad87-cbed33c141e5</name>
-          <tableName>ASYS_PERMISSION</tableName>
-          <primaryKey>PERMISSIONID</primaryKey>
-          <isUIDTable v="false" />
-          <readonly v="false" />
-        </linkInformation>
-      </linkInformation>
-      <recordFieldMappings>
-        <dbRecordFieldMapping>
-          <name>COND.value</name>
-          <recordfield>AB_PERMISSION.COND</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>CONDTYPE.value</name>
-          <recordfield>AB_PERMISSION.CONDTYPE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>AB_PERMISSIONID.value</name>
-          <recordfield>AB_PERMISSION.AB_PERMISSIONID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>AB_PERMISSIONSET_ID.value</name>
-          <recordfield>AB_PERMISSION.AB_PERMISSIONSET_ID</recordfield>
-        </dbRecordFieldMapping>
-      </recordFieldMappings>
-    </dbRecordContainer>
-  </recordContainers>
-</entity>
diff --git a/entity/Permission_entity/entityfields/ab_permissionid/valueProcess.js b/entity/Permission_entity/entityfields/ab_permissionid/valueProcess.js
deleted file mode 100644
index 11b755b5848286f96ecb1bfe998ec711f663c476..0000000000000000000000000000000000000000
--- a/entity/Permission_entity/entityfields/ab_permissionid/valueProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.neon");
-import("system.result");
-import("system.util");
-import("system.vars");
-
-if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
-    result.string(util.getNewUUID());
\ No newline at end of file
diff --git a/entity/Permission_entity/entityfields/permissionpermissionactions/children/permissionid_param/valueProcess.js b/entity/Permission_entity/entityfields/permissionpermissionactions/children/permissionid_param/valueProcess.js
deleted file mode 100644
index 81cf4a044a683c7ccf5a3d4988fca7b5c0bbf3c2..0000000000000000000000000000000000000000
--- a/entity/Permission_entity/entityfields/permissionpermissionactions/children/permissionid_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("system.vars");
-
-result.string(vars.get("$field.AB_PERMISSIONID"));
\ No newline at end of file
diff --git a/entity/Permission_entity/recordcontainers/db/conditionProcess.js b/entity/Permission_entity/recordcontainers/db/conditionProcess.js
deleted file mode 100644
index 88f496a9fc2b9e659cce5a23c42fd5809e8e4653..0000000000000000000000000000000000000000
--- a/entity/Permission_entity/recordcontainers/db/conditionProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.db");
-import("system.result");
-
-if (vars.exists("$param.PermissionSetId_param") && vars.get("$param.PermissionSetId_param"))
-    result.string(db.translateCondition("ASYS_PERMISSIONSET_ID = '" + vars.get("$param.PermissionSetId_param") + "'"));
\ No newline at end of file
diff --git a/neonContext/Permission/Permission.aod b/neonContext/Permission/Permission.aod
deleted file mode 100644
index 9bf0b1f28c2e3fef505c2b3c35540c99c7e7a640..0000000000000000000000000000000000000000
--- a/neonContext/Permission/Permission.aod
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
-  <name>Permission</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <mainview>PermissionMain_view</mainview>
-  <filterview>PermissionFilter_view</filterview>
-  <editview>PermissionEdit_view</editview>
-  <preview>PermissionPreview_view</preview>
-  <entity>Permission_entity</entity>
-  <references>
-    <neonViewReference>
-      <name>213eac8e-fab6-43ea-83be-94ab26e0b252</name>
-      <view>PermissionMain_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>f33c6b95-272e-4561-bf04-91cbd58c2499</name>
-      <view>PermissionFilter_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>03b59ef0-f628-451a-a01e-800ca07baa67</name>
-      <view>PermissionEdit_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>ea9569b9-1d57-4826-970e-142ea2104350</name>
-      <view>PermissionPreview_view</view>
-    </neonViewReference>
-  </references>
-</neonContext>
diff --git a/neonContext/PermissionAction/PermissionAction.aod b/neonContext/PermissionAction/PermissionAction.aod
deleted file mode 100644
index 35d1cdbe1bb32cf8fcbd2d7512c903b498096f93..0000000000000000000000000000000000000000
--- a/neonContext/PermissionAction/PermissionAction.aod
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
-  <name>PermissionAction</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <mainview>PermissionActionMain_view</mainview>
-  <filterview>PermissionActionFilter_view</filterview>
-  <editview>PermissionActionEdit_view</editview>
-  <preview>PermissionActionPreview_view</preview>
-  <entity>PermissionAction_entity</entity>
-  <references>
-    <neonViewReference>
-      <name>5a7d27cc-ccc9-4b5a-af6d-1837d3bf8288</name>
-      <view>PermissionActionMain_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>5604d7b7-f37b-4995-a795-876cf2be244c</name>
-      <view>PermissionActionFilter_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>65501724-1b07-46c3-864c-eb3ecae7f5c7</name>
-      <view>PermissionActionEdit_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>63c1333e-af91-4293-9eef-b8e313aaa876</name>
-      <view>PermissionActionPreview_view</view>
-    </neonViewReference>
-  </references>
-</neonContext>
diff --git a/neonContext/PermissionAdmin/PermissionAdmin.aod b/neonContext/PermissionAdmin/PermissionAdmin.aod
deleted file mode 100644
index ea66aa44019d568774bcac3778c19cd30c10e739..0000000000000000000000000000000000000000
--- a/neonContext/PermissionAdmin/PermissionAdmin.aod
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
-  <name>PermissionAdmin</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <mainview>PermissionAdminMain_view</mainview>
-  <entity>PermissionAdmin_entity</entity>
-  <references>
-    <neonViewReference>
-      <name>8f545d49-e62f-438d-8d14-edcd966d6cd5</name>
-      <view>PermissionAdminMain_view</view>
-    </neonViewReference>
-  </references>
-</neonContext>
diff --git a/neonContext/PermissionSet/PermissionSet.aod b/neonContext/PermissionSet/PermissionSet.aod
deleted file mode 100644
index a74aa0ab4ebcd36f33db9a0d786a3d0017e7241d..0000000000000000000000000000000000000000
--- a/neonContext/PermissionSet/PermissionSet.aod
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
-  <name>PermissionSet</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <mainview>PermissionSetMain_view</mainview>
-  <filterview>PermissionSetFilter_view</filterview>
-  <editview>PermissionSetEdit_view</editview>
-  <preview>PermissionSetPreview_view</preview>
-  <entity>PermissionSet_entity</entity>
-  <references>
-    <neonViewReference>
-      <name>9b826112-967a-4dd1-ab50-e6ca8c9554fd</name>
-      <view>PermissionSetMain_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>eaa7dbdc-da6f-43a2-acd0-f71d7aaff96c</name>
-      <view>PermissionSetFilter_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>18b656ef-33f7-40ca-a86b-dfdcfe96b3f2</name>
-      <view>PermissionSetEdit_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>5b618ffc-1124-46ae-ad88-0b207688689a</name>
-      <view>PermissionSetPreview_view</view>
-    </neonViewReference>
-  </references>
-</neonContext>
diff --git a/neonView/PermissionActionEdit_view/PermissionActionEdit_view.aod b/neonView/PermissionActionEdit_view/PermissionActionEdit_view.aod
deleted file mode 100644
index 4bdaa43bee0dc7cf01a422e527b3fb09926528d0..0000000000000000000000000000000000000000
--- a/neonView/PermissionActionEdit_view/PermissionActionEdit_view.aod
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
-  <name>PermissionActionEdit_view</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <layout>
-    <boxLayout>
-      <name>layout</name>
-    </boxLayout>
-  </layout>
-  <children>
-    <genericViewTemplate>
-      <name>Generic</name>
-      <editMode v="true" />
-      <entityField>#ENTITY</entityField>
-      <fields>
-        <entityFieldLink>
-          <name>c2211f64-0134-4fff-b5bf-194fd4580d81</name>
-          <entityField>AB_PERMISSION_ID</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>5b378d43-5112-4d4d-9207-cd9b2caa7d1d</name>
-          <entityField>ACTION</entityField>
-        </entityFieldLink>
-      </fields>
-    </genericViewTemplate>
-  </children>
-</neonView>
diff --git a/neonView/PermissionActionFilter_view/PermissionActionFilter_view.aod b/neonView/PermissionActionFilter_view/PermissionActionFilter_view.aod
deleted file mode 100644
index 2ec89c457b59c100f31e39efa64e21ed5fbf0f0a..0000000000000000000000000000000000000000
--- a/neonView/PermissionActionFilter_view/PermissionActionFilter_view.aod
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
-  <name>PermissionActionFilter_view</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <filterable v="true" />
-  <layout>
-    <boxLayout>
-      <name>layout</name>
-    </boxLayout>
-  </layout>
-  <children>
-    <tableViewTemplate>
-      <name>Table</name>
-      <entityField>#ENTITY</entityField>
-      <columns>
-        <neonTableColumn>
-          <name>641efc97-974e-4f8b-972f-54f75c3707a7</name>
-          <entityField>AB_PERMISSIONACTIONID</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>8c116c1f-8323-4c55-8607-05ec9450e2a1</name>
-          <entityField>AB_PERMISSION_ID</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>e7c5906a-f747-403b-927d-66bcf2eee167</name>
-          <entityField>ACTION</entityField>
-        </neonTableColumn>
-      </columns>
-    </tableViewTemplate>
-  </children>
-</neonView>
diff --git a/neonView/PermissionActionMain_view/PermissionActionMain_view.aod b/neonView/PermissionActionMain_view/PermissionActionMain_view.aod
deleted file mode 100644
index d61d91733f95aee044a5833824dea203cecb9407..0000000000000000000000000000000000000000
--- a/neonView/PermissionActionMain_view/PermissionActionMain_view.aod
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
-  <name>PermissionActionMain_view</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <layout>
-    <masterSlaveLayout>
-      <name>layout</name>
-      <master>ec5bf5af-b20e-417e-87ac-fa52e069a7ef</master>
-    </masterSlaveLayout>
-  </layout>
-  <children>
-    <neonViewReference>
-      <name>ec5bf5af-b20e-417e-87ac-fa52e069a7ef</name>
-      <entityField>#ENTITY</entityField>
-      <view>PermissionActionPreview_view</view>
-    </neonViewReference>
-  </children>
-</neonView>
diff --git a/neonView/PermissionActionPreview_view/PermissionActionPreview_view.aod b/neonView/PermissionActionPreview_view/PermissionActionPreview_view.aod
deleted file mode 100644
index e43fa1a1b776a70a2f20b9707d2c03de4f5e9c4a..0000000000000000000000000000000000000000
--- a/neonView/PermissionActionPreview_view/PermissionActionPreview_view.aod
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
-  <name>PermissionActionPreview_view</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <layout>
-    <boxLayout>
-      <name>layout</name>
-    </boxLayout>
-  </layout>
-  <children>
-    <cardViewTemplate>
-      <name>Card</name>
-      <titleField>AB_PERMISSIONACTIONID</titleField>
-      <subtitleField>AB_PERMISSION_ID</subtitleField>
-      <descriptionField>ACTION</descriptionField>
-      <entityField>#ENTITY</entityField>
-      <title></title>
-    </cardViewTemplate>
-  </children>
-</neonView>
diff --git a/neonView/PermissionAdminMain_view/PermissionAdminMain_view.aod b/neonView/PermissionAdminMain_view/PermissionAdminMain_view.aod
deleted file mode 100644
index a9dbfbf7fd5f55b1a145d4590325abf7703ba5d6..0000000000000000000000000000000000000000
--- a/neonView/PermissionAdminMain_view/PermissionAdminMain_view.aod
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
-  <name>PermissionAdminMain_view</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <layout>
-    <masterSlaveLayout>
-      <name>layout</name>
-    </masterSlaveLayout>
-  </layout>
-  <children>
-    <neonViewReference>
-      <name>3549ccf4-0509-41b1-b048-ad3eec217b56</name>
-      <entityField>PermissionSets</entityField>
-      <view>PermissionSetFilter_view</view>
-    </neonViewReference>
-  </children>
-</neonView>
diff --git a/neonView/PermissionEdit_view/PermissionEdit_view.aod b/neonView/PermissionEdit_view/PermissionEdit_view.aod
deleted file mode 100644
index d1520edc9b4b40e33998759ccb083a5cfc21704a..0000000000000000000000000000000000000000
--- a/neonView/PermissionEdit_view/PermissionEdit_view.aod
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
-  <name>PermissionEdit_view</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <layout>
-    <boxLayout>
-      <name>layout</name>
-    </boxLayout>
-  </layout>
-  <children>
-    <genericViewTemplate>
-      <name>Generic</name>
-      <editMode v="true" />
-      <entityField>#ENTITY</entityField>
-      <fields>
-        <entityFieldLink>
-          <name>3fc8953d-ee49-4658-bfdb-02ceabb9d7d0</name>
-          <entityField>AB_PERMISSIONSET_ID</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>fd3bd753-2584-4303-9d23-724b609fb164</name>
-          <entityField>COND</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>3525447a-16aa-4e53-bb1e-58a9b6b5d963</name>
-          <entityField>CONDTYPE</entityField>
-        </entityFieldLink>
-      </fields>
-    </genericViewTemplate>
-  </children>
-</neonView>
diff --git a/neonView/PermissionFilter_view/PermissionFilter_view.aod b/neonView/PermissionFilter_view/PermissionFilter_view.aod
deleted file mode 100644
index 4c36b8f1bf96cc41ecc79973aff4a42285e3fac1..0000000000000000000000000000000000000000
--- a/neonView/PermissionFilter_view/PermissionFilter_view.aod
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
-  <name>PermissionFilter_view</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <filterable v="true" />
-  <layout>
-    <boxLayout>
-      <name>layout</name>
-    </boxLayout>
-  </layout>
-  <children>
-    <tableViewTemplate>
-      <name>Table</name>
-      <autoNewRow v="false" />
-      <entityField>#ENTITY</entityField>
-      <columns>
-        <neonTableColumn>
-          <name>fd0ebb2c-8709-48c2-b9c9-b091984ff215</name>
-          <entityField>AB_PERMISSIONID</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>f75af053-64a0-4a32-ae98-aef43e8fd48d</name>
-          <entityField>AB_PERMISSIONSET_ID</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>4e020af7-16b3-43f5-a6aa-f138a1af84fe</name>
-          <entityField>COND</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>26eb506e-c1af-4c15-86c2-dbdeedd99829</name>
-          <entityField>CONDTYPE</entityField>
-        </neonTableColumn>
-      </columns>
-    </tableViewTemplate>
-  </children>
-</neonView>
diff --git a/neonView/PermissionMain_view/PermissionMain_view.aod b/neonView/PermissionMain_view/PermissionMain_view.aod
deleted file mode 100644
index 1e74ecb5f34bcae6207d9442c2a77077c5045aaf..0000000000000000000000000000000000000000
--- a/neonView/PermissionMain_view/PermissionMain_view.aod
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
-  <name>PermissionMain_view</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <layout>
-    <masterSlaveLayout>
-      <name>layout</name>
-      <master>be583013-2f62-44bb-8419-c438c9b6e2bf</master>
-    </masterSlaveLayout>
-  </layout>
-  <children>
-    <neonViewReference>
-      <name>be583013-2f62-44bb-8419-c438c9b6e2bf</name>
-      <entityField>#ENTITY</entityField>
-      <view>PermissionPreview_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>ce0f025d-c465-4c46-ae41-40b66a3a65a7</name>
-      <entityField>PermissionPermissionActions</entityField>
-      <view>PermissionActionFilter_view</view>
-    </neonViewReference>
-  </children>
-</neonView>
diff --git a/neonView/PermissionPreview_view/PermissionPreview_view.aod b/neonView/PermissionPreview_view/PermissionPreview_view.aod
deleted file mode 100644
index 2991f6b11e2e20b629176ece529726a3cb793cca..0000000000000000000000000000000000000000
--- a/neonView/PermissionPreview_view/PermissionPreview_view.aod
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
-  <name>PermissionPreview_view</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <layout>
-    <boxLayout>
-      <name>layout</name>
-    </boxLayout>
-  </layout>
-  <children>
-    <cardViewTemplate>
-      <name>Card</name>
-      <iconField></iconField>
-      <titleField>AB_PERMISSIONID</titleField>
-      <subtitleField>AB_PERMISSIONSET_ID</subtitleField>
-      <descriptionField>COND</descriptionField>
-      <entityField>#ENTITY</entityField>
-    </cardViewTemplate>
-  </children>
-</neonView>
diff --git a/neonView/PermissionSetEdit_view/PermissionSetEdit_view.aod b/neonView/PermissionSetEdit_view/PermissionSetEdit_view.aod
deleted file mode 100644
index 157ca2033eb7d89cffa6fb801f5ad7b8777afbf3..0000000000000000000000000000000000000000
--- a/neonView/PermissionSetEdit_view/PermissionSetEdit_view.aod
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
-  <name>PermissionSetEdit_view</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <layout>
-    <boxLayout>
-      <name>layout</name>
-    </boxLayout>
-  </layout>
-  <children>
-    <genericViewTemplate>
-      <name>Generic</name>
-      <editMode v="true" />
-      <entityField>#ENTITY</entityField>
-      <fields>
-        <entityFieldLink>
-          <name>1ee315a6-ff9a-4b31-b789-d591b63de3a8</name>
-          <entityField>AB_PERMISSIONSET_ID</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>512e0f3f-b907-4c7b-9c9f-b3049785e54c</name>
-          <entityField>ACCESSTYPE</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>b77cae1d-b31c-4d66-89c5-8f192ca92a6b</name>
-          <entityField>ENTITY_ID</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>4e7543bd-9148-490d-a5d0-1147426ab830</name>
-          <entityField>ROLE_ID</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>50738384-3e3f-4f4c-a551-fb1fd1c8630b</name>
-          <entityField>FIELD_ID</entityField>
-        </entityFieldLink>
-      </fields>
-    </genericViewTemplate>
-  </children>
-</neonView>
diff --git a/neonView/PermissionSetFilter_view/PermissionSetFilter_view.aod b/neonView/PermissionSetFilter_view/PermissionSetFilter_view.aod
deleted file mode 100644
index 0fae1abf24eef141e7b0ec1d702e2e36f407e868..0000000000000000000000000000000000000000
--- a/neonView/PermissionSetFilter_view/PermissionSetFilter_view.aod
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
-  <name>PermissionSetFilter_view</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <filterable v="true" />
-  <layout>
-    <groupLayout>
-      <name>layout</name>
-    </groupLayout>
-  </layout>
-  <children>
-    <treeViewTemplate>
-      <name>Treetable</name>
-      <parentField>AB_PERMISSIONSET_ID</parentField>
-      <titleField>#TITLE</titleField>
-      <descriptionField>ROLE_ID</descriptionField>
-      <entityField>#ENTITY</entityField>
-    </treeViewTemplate>
-    <tableViewTemplate>
-      <name>Table</name>
-      <entityField>#ENTITY</entityField>
-      <columns>
-        <neonTableColumn>
-          <name>47eb58d4-da06-408c-bcd1-04f4dbe29990</name>
-          <entityField>AB_PERMISSIONSETID</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>1eb7e7f4-0bcc-4606-b02f-694a9be602a9</name>
-          <entityField>AB_PERMISSIONSET_ID</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>03009aa0-b334-4ee3-b90d-acb872e3a6b5</name>
-          <entityField>ROLE_ID</entityField>
-          <width v="75" />
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>da15c508-14e9-4041-b673-12cadfa89988</name>
-          <entityField>ENTITY_ID</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>aa88c597-c427-4d94-b5d5-e434decf8dd1</name>
-          <entityField>FIELD_ID</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>56f67868-6421-4664-9dcc-e6f578951dba</name>
-          <entityField>ACCESSTYPE</entityField>
-        </neonTableColumn>
-      </columns>
-    </tableViewTemplate>
-  </children>
-</neonView>
diff --git a/neonView/PermissionSetMain_view/PermissionSetMain_view.aod b/neonView/PermissionSetMain_view/PermissionSetMain_view.aod
deleted file mode 100644
index 13a4ee4fcc33ee7fadde7ef31121c2bb3f72df9f..0000000000000000000000000000000000000000
--- a/neonView/PermissionSetMain_view/PermissionSetMain_view.aod
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
-  <name>PermissionSetMain_view</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <layout>
-    <masterSlaveLayout>
-      <name>layout</name>
-      <master>8f6399dd-2a33-4f6a-b0f9-cceda7da5d24</master>
-    </masterSlaveLayout>
-  </layout>
-  <children>
-    <neonViewReference>
-      <name>8f6399dd-2a33-4f6a-b0f9-cceda7da5d24</name>
-      <entityField>#ENTITY</entityField>
-      <view>PermissionSetPreview_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>9135a8c5-28aa-4a66-af91-fcdf4c680d1e</name>
-      <entityField>Permissions</entityField>
-      <view>PermissionFilter_view</view>
-    </neonViewReference>
-  </children>
-</neonView>
diff --git a/neonView/PermissionSetPreview_view/PermissionSetPreview_view.aod b/neonView/PermissionSetPreview_view/PermissionSetPreview_view.aod
deleted file mode 100644
index e498f92bd54f3b218c02f792dab3424da4e25f82..0000000000000000000000000000000000000000
--- a/neonView/PermissionSetPreview_view/PermissionSetPreview_view.aod
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
-  <name>PermissionSetPreview_view</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <layout>
-    <boxLayout>
-      <name>layout</name>
-    </boxLayout>
-  </layout>
-  <children>
-    <cardViewTemplate>
-      <name>Card</name>
-      <iconField>#ICON</iconField>
-      <titleField>AB_PERMISSIONSETID</titleField>
-      <subtitleField>ROLE_ID</subtitleField>
-      <descriptionField>ENTITY_ID</descriptionField>
-      <entityField>#ENTITY</entityField>
-    </cardViewTemplate>
-    <genericViewTemplate>
-      <name>Generic</name>
-      <editMode v="false" />
-      <entityField>#ENTITY</entityField>
-      <fields>
-        <entityFieldLink>
-          <name>76a1cfbb-5c30-410c-84c5-c0473282f8ed</name>
-          <entityField>ACCESSTYPE</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>34f3342c-7269-42d2-a24d-cdf962186f19</name>
-          <entityField>FIELD_ID</entityField>
-        </entityFieldLink>
-      </fields>
-    </genericViewTemplate>
-  </children>
-</neonView>