diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index cfca8092dc5eebed3221902d2475e37432bfbbb5..f684665e4f5ad991d78f00dfa4f0cd0b7c4c47eb 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -10313,7 +10313,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="true" />
+ <index v="false" />
<documentation></documentation>
<title></title>
<description></description>
@@ -11614,20 +11614,6 @@
<title></title>
<description></description>
</entityFieldDb>
- <entityFieldDb>
- <name>DB_FIELD_NAME</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="100" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
<entityFieldDb>
<name>IS_ID_FIELD</name>
<dbName></dbName>
diff --git a/entity/ActionGroup/ActionGroup.aod b/entity/ActionGroup/ActionGroup.aod
deleted file mode 100644
index 915f236200bb473e13d0a85e9c271fb477befb27..0000000000000000000000000000000000000000
--- a/entity/ActionGroup/ActionGroup.aod
+++ /dev/null
@@ -1,37 +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.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
- <name>Duplicates_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <recordContainer>jditoRecordContainer</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- <dependencies>
- <entityDependency>
- <name>d92fb732-c99d-40ae-a7f6-baf239f83b78</name>
- <entityName>Duplicates_entity</entityName>
- <fieldName>SelfPersonDuplicatesConsumer</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- </entityProvider>
- <entityField>
- <name>UID</name>
- </entityField>
- <entityField>
- <name>targetContext</name>
- </entityField>
- </entityFields>
- <recordContainers>
- <jDitoRecordContainer>
- <name>jditoRecordContainer</name>
- <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
- <contentProcess>%aditoprj%/entity/Duplicates_entity/recordcontainers/jditorecordcontainer/contentProcess.js</contentProcess>
- <recordFieldMappings>
- <jDitoRecordFieldMapping>
- <name>UID.value</name>
- </jDitoRecordFieldMapping>
- </recordFieldMappings>
- </jDitoRecordContainer>
- </recordContainers>
-</entity>
diff --git a/entity/ActionGroup/recordcontainers/jditorecordcontainer/contentProcess.js b/entity/ActionGroup/recordcontainers/jditorecordcontainer/contentProcess.js
deleted file mode 100644
index 6eb974e29cb5134d392d717e040e23b05ce04d4f..0000000000000000000000000000000000000000
--- a/entity/ActionGroup/recordcontainers/jditorecordcontainer/contentProcess.js
+++ /dev/null
@@ -1,92 +0,0 @@
-import("system.result");
-import("system.vars");
-import("DuplicateScanner_lib");
-import("system.logging");
-
-//var contactIdToCheck = vars.get("$param.contactIdToCheckForCachedDuplicates_param");
-
-//result.string(DuplicateScannerUtils.GetCachedDuplicatesForContactId(contactIdToCheck));
-result.string("asd");
-
-
-//var filterName = vars.get("$param.filterName_param");
-//var targetEntity = vars.get("$param.targetEntity_param");
-//var targetContext = vars.get("$param.targetContext_param");
-//var values = JSON.parse(vars.get("$param.valuesToScan_param"));
-//var resultFields = JSON.parse(vars.get("$param.resultFields_param"));
-//var resultFieldsIdFieldName = vars.get("$param.resultFieldsIdFieldName_param");
-//var maxRecorValues = parseInt(vars.get("$field.maxReturnValueCount"), 10);
-//var recordIdToIgnore = vars.get("$param.recordIdToIgnore_param");
-//
-//logging.log("filterName -> " + filterName);
-//logging.log("targetEntity -> " + targetEntity);
-//logging.log("values -> " + values);
-//logging.log("resultFields -> " + resultFields);
-
-
-
-//var duplicates = DuplicateScannerUtils.ScanForDuplicates(filterName, targetEntity, values, resultFields, resultFieldsIdFieldName, recordIdToIgnore);
-//logging.log("duplicates -> " + JSON.stringify(duplicates));
-//
-////[{"FIRSTNAME":"Markus","LASTNAME":"Altinger","PERSONID":"0a611832-9476-481e-bde5-af3c3a98f1b4"},
-////{"FIRSTNAME":"Marshel","LASTNAME":"Ericson","PERSONID":"44c5d7db-b96e-4f67-a00f-c206cd3f7e1b"}]
-//var returnRay = [];
-//logging.log("duplicates.length -> " + duplicates.length);
-//for (i = 0; i < duplicates.length; i++)
-//{
-// let newRecord = _compileSingleRecord(duplicates[i], resultFieldsIdFieldName, maxRecorValues, targetContext);
-//
-// logging.log("newRecord -> " + newRecord);
-// returnRay.push(newRecord);
-//}
-//result.object(returnRay);
-//
-//
-//function _compileSingleRecord(pDuplicate, pIdFieldName, maxRecordValues, pTargetContext)
-//{
-// let newRecord = [];
-// let recordId = pDuplicate[pIdFieldName];
-//
-// newRecord.push(recordId);
-// newRecord.push(pTargetContext);
-//
-// let recordCount = 0;
-//
-// for(recordValue in pDuplicate)
-// {
-// logging.log("recordKey -> " + recordValue);
-// logging.log("revordValue -> " + pDuplicate[recordValue]);
-//
-// recordCount++;
-//
-// //The record Id has already been added, only the rest gets added
-// if(recordValue != pIdFieldName)
-// newRecord.push(pDuplicate[recordValue]);
-//
-// logging.log("recourdcount -> " + recordCount);
-// logging.log("maxRecordValues-1 -> " + (maxRecordValues-1));
-// //subtract 2 because in this for loop only the values get added
-// //The id as well as the targetContext are handled separately
-// if(recordCount == maxRecordValues-2)
-// break;
-// }
-//
-// logging.log("newRecord.length -> " + newRecord.length);
-// logging.log("maxRecordValues -> " + maxRecordValues);
-//
-//
-//
-// //If there are less elements than required, fill the record with empty strings
-// //because a recor dof a recordContainer always has to have the correct length defined by the "recordFieldMappings
-// if(newRecord.length < maxRecordValues)
-// {
-// let elementsToFill = maxRecordValues - newRecord.length;
-// for (a = 0; a < elementsToFill; a++)
-// {
-// newRecord.push("");
-// }
-// }
-// logging.log("newRecord -> " + newRecord);
-// return newRecord;
-//
-//}
\ No newline at end of file
diff --git a/entity/DuplicateScanConditionConfig_entity/DuplicateScanConditionConfig_entity.aod b/entity/DuplicateScanConditionConfig_entity/DuplicateScanConditionConfig_entity.aod
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/entity/DuplicateScanConditionConfig_entity/documentation.adoc b/entity/DuplicateScanConditionConfig_entity/documentation.adoc
deleted file mode 100644
index 19fe43d93f2f5111e01fd0f5a13c6130c60fd90c..0000000000000000000000000000000000000000
--- a/entity/DuplicateScanConditionConfig_entity/documentation.adoc
+++ /dev/null
@@ -1,3 +0,0 @@
-= DuplicateScanConditionConfig_entity
-
-Configuration for the DuplicateScan_entity
\ No newline at end of file
diff --git a/entity/DuplicateScan_entity/DuplicateScan_entity.aod b/entity/DuplicateScan_entity/DuplicateScan_entity.aod
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/entity/DuplicateScan_entity/documentation.adoc b/entity/DuplicateScan_entity/documentation.adoc
deleted file mode 100644
index 509a41c54d92997d5220343dff018a4953f7e3e5..0000000000000000000000000000000000000000
--- a/entity/DuplicateScan_entity/documentation.adoc
+++ /dev/null
@@ -1,3 +0,0 @@
-= DuplicateScan_entity
-
-Entity for the DuplicatScan in the system
\ No newline at end of file
diff --git a/entity/DuplicateScan_entity/entityfields/external_service_usage_allowed/valueProcess.js b/entity/DuplicateScan_entity/entityfields/external_service_usage_allowed/valueProcess.js
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index d20cdd31c80efc0714406e2c1c27842c364d5667..66e6e1da984c2a05cea034aaa68846cd65456f1a 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -1316,11 +1316,6 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<isFilterable v="true" />
<filtertype>BASIC</filtertype>
</consumerMapping>
- <consumerMapping>
- <name>PersAddresses</name>
- <isFilterable v="true" />
- <filtertype>EXTENDED</filtertype>
- </consumerMapping>
</recordFieldMappings>
<filterExtensions>
<filterExtensionSet>
diff --git a/neonView/Options1_View/Options1_View.aod b/neonView/Options1_View/Options1_View.aod
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/neonView/Options2_View/Options2_View.aod b/neonView/Options2_View/Options2_View.aod
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000