diff --git a/apps/red-ui/src/app/modules/shared/components/add-edit-entity/add-edit-entity.component.html b/apps/red-ui/src/app/modules/shared/components/add-edit-entity/add-edit-entity.component.html
index 01e6d4a67..d5790c69f 100644
--- a/apps/red-ui/src/app/modules/shared/components/add-edit-entity/add-edit-entity.component.html
+++ b/apps/red-ui/src/app/modules/shared/components/add-edit-entity/add-edit-entity.component.html
@@ -78,24 +78,6 @@
         ></textarea>
     </div>
 
-    <div *ngIf="isIqserDevMode && form.get('aiCreationEnabled')" class="iqser-input-group">
-        <mat-slide-toggle color="primary" formControlName="aiCreationEnabled">
-            {{ 'add-edit-entity.form.ai-creation-enabled' | translate }}
-        </mat-slide-toggle>
-    </div>
-
-    <div *ngIf="isIqserDevMode && form.get('aiCreationEnabled')?.value && form.get('aiDescription')" class="iqser-input-group w-400">
-        <label translate="add-edit-entity.form.ai-description"></label>
-        <textarea
-            [placeholder]="'add-edit-entity.form.ai-description-placeholder' | translate"
-            formControlName="aiDescription"
-            iqserHasScrollbar
-            name="aiDescription"
-            rows="4"
-            type="text"
-        ></textarea>
-    </div>
-
     <div *ngIf="form.get('hasDictionary')" class="iqser-input-group">
         <mat-slide-toggle color="primary" formControlName="hasDictionary">
             {{ 'add-edit-entity.form.has-dictionary' | translate }}
diff --git a/apps/red-ui/src/app/modules/shared/components/add-edit-entity/add-edit-entity.component.ts b/apps/red-ui/src/app/modules/shared/components/add-edit-entity/add-edit-entity.component.ts
index f6ab4f7a7..a45e20c63 100644
--- a/apps/red-ui/src/app/modules/shared/components/add-edit-entity/add-edit-entity.component.ts
+++ b/apps/red-ui/src/app/modules/shared/components/add-edit-entity/add-edit-entity.component.ts
@@ -9,7 +9,7 @@ import { MatSelect } from '@angular/material/select';
 import { MatSlideToggle } from '@angular/material/slide-toggle';
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
 import { RoundCheckboxComponent } from '@common-ui/inputs/round-checkbox/round-checkbox.component';
-import { BaseFormComponent, getConfig, isIqserDevMode, HasScrollbarDirective, LoadingService, Toaster } from '@iqser/common-ui';
+import { BaseFormComponent, getConfig, HasScrollbarDirective, LoadingService, Toaster } from '@iqser/common-ui';
 import { TranslateModule } from '@ngx-translate/core';
 import { Dictionary, IDictionary } from '@red/domain';
 import { DictionariesMapService } from '@services/entity-services/dictionaries-map.service';
@@ -62,7 +62,6 @@ export class AddEditEntityComponent extends BaseFormComponent implements OnInit
 
     colors: Color[];
     readonly isDocumine = getConfig().IS_DOCUMINE;
-    readonly isIqserDevMode = isIqserDevMode();
 
     constructor(
         private readonly _dictionariesMapService: DictionariesMapService,
@@ -159,8 +158,6 @@ export class AddEditEntityComponent extends BaseFormComponent implements OnInit
             skippedHexColor: [this.entity?.skippedHexColor, [Validators.required, Validators.minLength(7)]],
             type: [this.entity?.type],
             description: [this.entity?.description],
-            aiCreationEnabled: [this.entity?.aiCreationEnabled],
-            aiDescription: [this.entity?.aiDescription],
             rank: [{ value: this.entity?.rank, disabled: this.#isSystemManaged }, Validators.required],
             hint: [{ value: !!this.entity?.hint, disabled: this.#isSystemManaged }],
             hasDictionary: [
@@ -253,8 +250,6 @@ export class AddEditEntityComponent extends BaseFormComponent implements OnInit
             dossierTemplateId: this.dossierTemplateId,
             type: this.form.get('type').value,
             description: this.form.get('description').value,
-            aiCreationEnabled: this.form.get('aiCreationEnabled').value,
-            aiDescription: this.form.get('aiDescription').value,
             hint: this.#isHint,
             rank: this.form.get('rank').value,
             caseInsensitive: !this.form.get('caseSensitive').value,
diff --git a/apps/red-ui/src/assets/i18n/redact/de.json b/apps/red-ui/src/assets/i18n/redact/de.json
index 9afcfb101..7ab47e05c 100644
--- a/apps/red-ui/src/assets/i18n/redact/de.json
+++ b/apps/red-ui/src/assets/i18n/redact/de.json
@@ -112,6 +112,9 @@
     }
   },
   "add-edit-dossier-attribute": {
+    "error": {
+      "generic": "Speichern des Attributs fehlgeschlagen."
+    },
     "form": {
       "label": "Name des Attributs",
       "label-placeholder": "Namen eingeben",
@@ -135,9 +138,6 @@
   },
   "add-edit-entity": {
     "form": {
-      "ai-creation-enabled": "KI-Erstellung aktivieren",
-      "ai-description": "KI-Beschreibung",
-      "ai-description-placeholder": "KI-Beschreibung eingeben",
       "case-sensitive": "Groß-/Kleinschreibung beachten",
       "color": "Farbe {type, select, redaction{Schwärzung} hint{Hinweis} recommendation{Empfehlung} skipped{Ingorierte Schwärzung} ignored{Ignorierter Hinweis} other{}}",
       "color-placeholder": "#",
diff --git a/apps/red-ui/src/assets/i18n/redact/en.json b/apps/red-ui/src/assets/i18n/redact/en.json
index 2bb0e6013..7ba620704 100644
--- a/apps/red-ui/src/assets/i18n/redact/en.json
+++ b/apps/red-ui/src/assets/i18n/redact/en.json
@@ -112,6 +112,9 @@
     }
   },
   "add-edit-dossier-attribute": {
+    "error": {
+      "generic": "Failed to save attribute."
+    },
     "form": {
       "label": "Attribute name",
       "label-placeholder": "Enter name",
@@ -135,9 +138,6 @@
   },
   "add-edit-entity": {
     "form": {
-      "ai-creation-enabled": "Enable AI creation",
-      "ai-description": "AI Description",
-      "ai-description-placeholder": "Enter AI description",
       "case-sensitive": "Case-sensitive",
       "color": "{type, select, redaction{Redaction} hint{Hint} recommendation{Recommendation} skipped{Skipped redaction} ignored{Ignored hint} other{}} color",
       "color-placeholder": "#",
diff --git a/apps/red-ui/src/assets/i18n/scm/de.json b/apps/red-ui/src/assets/i18n/scm/de.json
index 6b0660aca..ce0b0a7b2 100644
--- a/apps/red-ui/src/assets/i18n/scm/de.json
+++ b/apps/red-ui/src/assets/i18n/scm/de.json
@@ -112,6 +112,9 @@
     }
   },
   "add-edit-dossier-attribute": {
+    "error": {
+      "generic": "Speichern des Attributs fehlgeschlagen."
+    },
     "form": {
       "label": "Name des Attributs",
       "label-placeholder": "Namen eingeben",
@@ -135,9 +138,6 @@
   },
   "add-edit-entity": {
     "form": {
-      "ai-creation-enabled": "Enable AI creation",
-      "ai-description": "AI Description",
-      "ai-description-placeholder": "Enter AI description",
       "case-sensitive": "Groß-/Kleinschreibung beachten",
       "color": "Farbe {type, select, redaction{Annotation} hint{Hinweis} recommendation{Empfehlung} skipped{Übersprungene Annotation} ignored{Ignorierter Hinweis} other{}}",
       "color-placeholder": "#",
diff --git a/apps/red-ui/src/assets/i18n/scm/en.json b/apps/red-ui/src/assets/i18n/scm/en.json
index 532ceadec..f2c03bfa7 100644
--- a/apps/red-ui/src/assets/i18n/scm/en.json
+++ b/apps/red-ui/src/assets/i18n/scm/en.json
@@ -112,6 +112,9 @@
     }
   },
   "add-edit-dossier-attribute": {
+    "error": {
+      "generic": "Failed to save attribute!"
+    },
     "form": {
       "label": "Attribute name",
       "label-placeholder": "Enter name",
@@ -135,9 +138,6 @@
   },
   "add-edit-entity": {
     "form": {
-      "ai-creation-enabled": "Enable AI creation",
-      "ai-description": "AI Description",
-      "ai-description-placeholder": "Enter AI description",
       "case-sensitive": "Case-sensitive",
       "color": "{type, select, redaction{Annotation} hint{Hint} recommendation{Recommendation} skipped{Skipped annotation} ignored{Ignored hint} other{}} Color",
       "color-placeholder": "#",
diff --git a/libs/red-domain/src/lib/dictionaries/dictionary.model.ts b/libs/red-domain/src/lib/dictionaries/dictionary.model.ts
index 86e40c4e3..4c33e7840 100644
--- a/libs/red-domain/src/lib/dictionaries/dictionary.model.ts
+++ b/libs/red-domain/src/lib/dictionaries/dictionary.model.ts
@@ -7,8 +7,6 @@ export class Dictionary extends Entity<IDictionary> implements IDictionary {
     readonly addToDictionaryAction: boolean;
     readonly caseInsensitive: boolean;
     readonly description: string;
-    readonly aiCreationEnabled: boolean;
-    readonly aiDescription: string;
     readonly dossierTemplateId?: string;
     readonly hexColor?: string;
     readonly recommendationHexColor?: string;
@@ -35,8 +33,6 @@ export class Dictionary extends Entity<IDictionary> implements IDictionary {
         this.addToDictionaryAction = !!entity.addToDictionaryAction;
         this.caseInsensitive = !!entity.caseInsensitive;
         this.description = entity.description ?? '';
-        this.aiCreationEnabled = !!entity.aiCreationEnabled;
-        this.aiDescription = entity.aiDescription ?? '';
         this.dossierTemplateId = entity.dossierTemplateId;
         this.entries = entity.entries ?? [];
         this.falsePositiveEntries = entity.falsePositiveEntries ?? [];
diff --git a/libs/red-domain/src/lib/dictionaries/dictionary.ts b/libs/red-domain/src/lib/dictionaries/dictionary.ts
index 6f01105fc..d146393bf 100644
--- a/libs/red-domain/src/lib/dictionaries/dictionary.ts
+++ b/libs/red-domain/src/lib/dictionaries/dictionary.ts
@@ -16,14 +16,6 @@ export interface IDictionary {
      * The description of the dictionary type
      */
     readonly description?: string;
-    /**
-     * True if the entries in this type should also be created via AI, default is false.
-     */
-    readonly aiCreationEnabled?: boolean;
-    /**
-     * The AI description of the dictionary type
-     */
-    readonly aiDescription?: string;
     /**
      * The DossierTemplate Id for this type
      */