From 319b9ecf6bdbf98fa6f186790096111dcfaf0012 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Fuch=C3=9F?= <dominik.fuchss@kit.edu>
Date: Wed, 21 Aug 2024 09:17:41 +0200
Subject: [PATCH] Remove Diagrams from Core (#391)

---
 .../ardoco/core/api/InputDiagramData.java     |  79 ----
 .../DiagramMatchingModelSelectionState.java   | 123 -------
 .../DiagramModelInconsistencyState.java       |  56 ---
 .../DiagramModelLinkState.java                |  38 --
 .../api/diagramconsistency/DiagramState.java  |  30 --
 .../common/DiagramUtility.java                | 127 -------
 .../api/diagramconsistency/common/Edge.java   |  37 --
 .../common/ElementRole.java                   |  30 --
 .../common/Extractions.java                   | 165 ---------
 .../api/diagramconsistency/common/Label.java  |  18 -
 .../common/TextSimilarity.java                |  96 -----
 .../common/Transformations.java               | 343 ------------------
 .../api/diagramconsistency/common/Vertex.java |  64 ----
 .../common/WeightedTextSimilarity.java        | 115 ------
 .../HierarchyInconsistency.java               |  80 ----
 .../common/inconsistencies/Inconsistency.java | 104 ------
 .../inconsistencies/InconsistencyType.java    |  34 --
 .../MissingBoxInconsistency.java              |  39 --
 .../MissingLineInconsistency.java             |  76 ----
 .../inconsistencies/NameInconsistency.java    |  82 -----
 .../UnexpectedBoxInconsistency.java           |  39 --
 .../UnexpectedLineInconsistency.java          |  76 ----
 .../inconsistencies/refinement/Casing.java    | 114 ------
 .../inconsistencies/refinement/Group.java     |  70 ----
 .../refinement/LineInversion.java             | 117 ------
 .../refinement/NameExtension.java             | 129 -------
 .../inconsistencies/refinement/Swap.java      | 117 ------
 .../rules/AllBoxesMustBeLinked.java           |  23 --
 .../AllModelEntitiesMustBeRepresented.java    |  24 --
 .../rules/BoxesMustBeInParent.java            |  80 ----
 ...sMustBeConnectedExactlyToDependencies.java |  70 ----
 ...MustContainAllSubpackagesIfOneIsEmpty.java |  92 -----
 .../common/inconsistencies/rules/Rule.java    |  84 -----
 .../rules/SameNameForLinkedElements.java      |  28 --
 .../similarityflooding/FixpointFormula.java   | 120 ------
 .../similarityflooding/LabeledEdge.java       |  17 -
 .../similarityflooding/MatchingFilter.java    |  25 --
 .../OrderedMatchingFilter.java                | 108 ------
 .../PropagationCoefficientFormula.java        |  63 ----
 .../SimilarityFloodingAlgorithm.java          | 281 --------------
 .../similarityflooding/SimilarityMapping.java | 148 --------
 .../api/diagramrecognition/BoundingBox.java   | 152 --------
 .../core/api/diagramrecognition/Box.java      | 286 ---------------
 .../diagramrecognition/Classification.java    |  36 --
 .../api/diagramrecognition/Connector.java     |  36 --
 .../core/api/diagramrecognition/Diagram.java  |  70 ----
 .../diagramrecognition/DiagramElement.java    | 119 ------
 .../DiagramRecognitionState.java              |  61 ----
 .../api/diagramrecognition/DiagramUtil.java   |  87 -----
 .../core/api/diagramrecognition/TextBox.java  | 120 ------
 .../DiagramGoldStandardTraceLink.java         |  91 -----
 .../diagrams/DiagramTextTraceLink.java        |  92 -----
 .../diagrams/DiagramWordTraceLink.java        | 114 ------
 .../models/tracelinks/diagrams/TraceType.java |  31 --
 .../common/util/DataRepositoryHelper.java     |  37 --
 55 files changed, 4893 deletions(-)
 delete mode 100644 framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/InputDiagramData.java
 delete mode 100644 framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/DiagramMatchingModelSelectionState.java
 delete mode 100644 framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/DiagramModelInconsistencyState.java
 delete mode 100644 framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/DiagramModelLinkState.java
 delete mode 100644 framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/DiagramState.java
 delete mode 100644 framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/DiagramUtility.java
 delete mode 100644 framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/Edge.java
 delete mode 100644 framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/ElementRole.java
 delete mode 100644 framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/Extractions.java
 delete mode 100644 framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/Label.java
 delete mode 100644 framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/TextSimilarity.java
 delete mode 100644 framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/Transformations.java
 delete mode 100644 framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/Vertex.java
 delete mode 100644 framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/WeightedTextSimilarity.java
 delete mode 100644 framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/HierarchyInconsistency.java
 delete mode 100644 framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/Inconsistency.java
 delete mode 100644 framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/InconsistencyType.java
 delete mode 100644 framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/MissingBoxInconsistency.java
 delete mode 100644 framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/MissingLineInconsistency.java
 delete mode 100644 framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/NameInconsistency.java
 delete mode 100644 framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/UnexpectedBoxInconsistency.java
 delete mode 100644 framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/UnexpectedLineInconsistency.java
 delete mode 100644 framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/refinement/Casing.java
 delete mode 100644 framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/refinement/Group.java
 delete mode 100644 framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/refinement/LineInversion.java
 delete mode 100644 framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/refinement/NameExtension.java
 delete mode 100644 framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/refinement/Swap.java
 delete mode 100644 framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/rules/AllBoxesMustBeLinked.java
 delete mode 100644 framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/rules/AllModelEntitiesMustBeRepresented.java
 delete mode 100644 framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/rules/BoxesMustBeInParent.java
 delete mode 100644 framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/rules/EntitiesMustBeConnectedExactlyToDependencies.java
 delete mode 100644 framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/rules/PackagesMustContainAllSubpackagesIfOneIsEmpty.java
 delete mode 100644 framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/rules/Rule.java
 delete mode 100644 framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/rules/SameNameForLinkedElements.java
 delete mode 100644 framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/similarityflooding/FixpointFormula.java
 delete mode 100644 framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/similarityflooding/LabeledEdge.java
 delete mode 100644 framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/similarityflooding/MatchingFilter.java
 delete mode 100644 framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/similarityflooding/OrderedMatchingFilter.java
 delete mode 100644 framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/similarityflooding/PropagationCoefficientFormula.java
 delete mode 100644 framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/similarityflooding/SimilarityFloodingAlgorithm.java
 delete mode 100644 framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/similarityflooding/SimilarityMapping.java
 delete mode 100644 framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramrecognition/BoundingBox.java
 delete mode 100644 framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramrecognition/Box.java
 delete mode 100644 framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramrecognition/Classification.java
 delete mode 100644 framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramrecognition/Connector.java
 delete mode 100644 framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramrecognition/Diagram.java
 delete mode 100644 framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramrecognition/DiagramElement.java
 delete mode 100644 framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramrecognition/DiagramRecognitionState.java
 delete mode 100644 framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramrecognition/DiagramUtil.java
 delete mode 100644 framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramrecognition/TextBox.java
 delete mode 100644 framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/models/tracelinks/diagrams/DiagramGoldStandardTraceLink.java
 delete mode 100644 framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/models/tracelinks/diagrams/DiagramTextTraceLink.java
 delete mode 100644 framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/models/tracelinks/diagrams/DiagramWordTraceLink.java
 delete mode 100644 framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/models/tracelinks/diagrams/TraceType.java

diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/InputDiagramData.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/InputDiagramData.java
deleted file mode 100644
index 7b6fe9ab3..000000000
--- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/InputDiagramData.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/* Licensed under MIT 2023-2024. */
-package edu.kit.kastel.mcse.ardoco.core.api;
-
-import java.io.File;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Objects;
-
-import edu.kit.kastel.mcse.ardoco.core.common.tuple.Pair;
-import edu.kit.kastel.mcse.ardoco.core.data.PipelineStepData;
-
-/**
- * This {@link PipelineStepData} gives access to diagrams associated with the project to analyze.
- */
-public class InputDiagramData implements PipelineStepData {
-    public static final String ID = "InputDiagramData";
-    private static final List<String> ALLOWED_FILE_TYPES = List.of("jpg", "png", "jpeg");
-
-    private String pathToDiagrams;
-
-    private List<Pair<String, File>> diagramFiles;
-
-    /**
-     * Create the data by a directory of image files.
-     *
-     * @param pathToDiagrams the path to a directory containing diagrams and sketches
-     */
-    public InputDiagramData(String pathToDiagrams) {
-        this.pathToDiagrams = Objects.requireNonNull(pathToDiagrams);
-    }
-
-    /**
-     * Create the data by a directory of image files.
-     *
-     * @param diagramDirectory the directory containing diagrams and sketches
-     */
-    public InputDiagramData(File diagramDirectory) {
-        this(Objects.requireNonNull(diagramDirectory).getAbsolutePath());
-    }
-
-    /**
-     * Create the data by a list of image files.
-     *
-     * @param diagramFiles the diagram files
-     */
-    public InputDiagramData(List<Pair<String, File>> diagramFiles) {
-        Objects.requireNonNull(diagramFiles);
-        this.diagramFiles = diagramFiles;
-    }
-
-    /**
-     * Get all image files of the given directory (not recursive).
-     *
-     * @return a list of image files ordered by name
-     */
-    public List<Pair<String, File>> getDiagramData() {
-        if (diagramFiles != null)
-            return diagramFiles;
-        if (pathToDiagrams == null)
-            return List.of();
-        File directoryOfDiagrams = new File(pathToDiagrams);
-        if (!directoryOfDiagrams.exists() || !directoryOfDiagrams.isDirectory()) {
-            return List.of();
-        }
-        File[] allFiles = directoryOfDiagrams.listFiles();
-        if (allFiles == null)
-            return List.of();
-        List<Pair<String, File>> diagrams = Arrays.stream(allFiles)
-                .filter(File::isFile)
-                .filter(f -> ALLOWED_FILE_TYPES.stream().anyMatch(t -> f.getName().toLowerCase().endsWith("." + t)))
-                .sorted(Comparator.comparing(File::getName))
-                .map(f -> new Pair<>(f.getName(), f))
-                .toList();
-        logger.info("Found {} diagrams to consider.", diagrams.size());
-        return diagrams;
-    }
-
-}
diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/DiagramMatchingModelSelectionState.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/DiagramMatchingModelSelectionState.java
deleted file mode 100644
index d3f26c23e..000000000
--- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/DiagramMatchingModelSelectionState.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/* Licensed under MIT 2023. */
-package edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common.ElementRole;
-import edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common.WeightedTextSimilarity;
-import edu.kit.kastel.mcse.ardoco.core.api.models.ModelType;
-import edu.kit.kastel.mcse.ardoco.core.architecture.Deterministic;
-import edu.kit.kastel.mcse.ardoco.core.data.PipelineStepData;
-
-/**
- * Stores data created during the model selection process, as well as the selection itself. The data includes a created
- * text similarity function and all occurrences of diagram elements in models.
- */
-@Deterministic
-public interface DiagramMatchingModelSelectionState extends PipelineStepData {
-    /**
-     * The ID of this state.
-     */
-    String ID = "DiagramMatchingModelSelectionState";
-
-    /**
-     * Gets the model types that are in principle available, meaning their loading is attempted.
-     *
-     * @return The model types.
-     */
-    Set<ModelType> getAvailableModelTypes();
-
-    /**
-     * Sets the model types that are in principle available, meaning their loading is attempted.
-     *
-     * @param availableModelTypes
-     *                            The model types.
-     */
-    void setAvailableModelTypes(Set<ModelType> availableModelTypes);
-
-    /**
-     * Gets the similarity function.
-     *
-     * @return The similarity function.
-     */
-    WeightedTextSimilarity getSimilarityFunction();
-
-    /**
-     * Sets the similarity function.
-     *
-     * @param similarity
-     *                   The similarity function.
-     */
-    void setSimilarityFunction(WeightedTextSimilarity similarity);
-
-    /**
-     * Gets the model type that is selected to be matched with the diagram.
-     *
-     * @return The model type.
-     */
-    Set<ModelType> getSelection();
-
-    /**
-     * Sets the models that are selected to be matched with the diagram.
-     *
-     * @param modelTypes
-     *                   The model types.
-     */
-    void setSelection(Set<ModelType> modelTypes);
-
-    /**
-     * Adds an occurrence of a diagram element in a model.
-     *
-     * @param diagramID The ID of the diagram element.
-     * @param modelType The model the model element is in.
-     * @param modelID   The ID of the model element.
-     * @param role      The role of the model element.
-     */
-    void addOccurrence(String diagramID, ModelType modelType, String modelID, ElementRole role);
-
-    /**
-     * Get all occurrences of a diagram element in a model.
-     *
-     * @param diagramID The ID of the diagram element.
-     * @param modelType The model to get the occurrences in.
-     * @return The occurrences.
-     */
-    List<Occurrence> getOccurrences(String diagramID, ModelType modelType);
-
-    /**
-     * Get all occurrences of a diagram element in all models.
-     *
-     * @param diagramID
-     *                  The ID of the diagram element.
-     * @return The occurrences.
-     */
-    List<Occurrence> getOccurrences(String diagramID);
-
-    /**
-     * Gets the explanation why the model type was selected.
-     *
-     * @return The explanation, which is a match value for each model type.
-     */
-    Map<ModelType, Double> getSelectionExplanation();
-
-    /**
-     * Sets the explanation why the model type was selected.
-     *
-     * @param explanation
-     *                    The explanation, which is a match value for each model type.
-     */
-    void setSelectionExplanation(Map<ModelType, Double> explanation);
-
-    /**
-     * Describes an occurrence of a diagram element in a model.
-     *
-     * @param modelID
-     *                The ID of the model element.
-     * @param role
-     *                The role of the model element.
-     */
-    public record Occurrence(String modelID, ElementRole role) {
-    }
-}
diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/DiagramModelInconsistencyState.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/DiagramModelInconsistencyState.java
deleted file mode 100644
index 229005521..000000000
--- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/DiagramModelInconsistencyState.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Licensed under MIT 2023. */
-package edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency;
-
-import java.util.List;
-
-import edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common.inconsistencies.Inconsistency;
-import edu.kit.kastel.mcse.ardoco.core.api.models.ModelType;
-import edu.kit.kastel.mcse.ardoco.core.data.PipelineStepData;
-
-/**
- * Contains information about found inconsistencies between the diagram and the given models.
- */
-public interface DiagramModelInconsistencyState extends PipelineStepData {
-    /**
-     * The ID of this state.
-     */
-    String ID = "DiagramModelInconsistencyState";
-
-    /**
-     * Adds an inconsistency.
-     *
-     * @param modelType     The model type to add the inconsistency for.
-     * @param inconsistency
-     *                      The inconsistency to add.
-     */
-    void addInconsistency(ModelType modelType, Inconsistency<String, String> inconsistency);
-
-    /**
-     * Returns all found inconsistencies.
-     *
-     * @param modelType The model type to get inconsistencies for.
-     * @return All inconsistencies.
-     */
-    List<Inconsistency<String, String>> getInconsistencies(ModelType modelType);
-
-    /**
-     * Set the extended inconsistencies. The extended inconsistency list is based on the basic inconsistency list but a
-     * larger selection of more concrete inconsistency types can be used.
-     *
-     * @param modelType
-     *                        The model type to set the inconsistencies for.
-     * @param inconsistencies
-     *                        The inconsistencies to set.
-     */
-    void setExtendedInconsistencies(ModelType modelType, List<Inconsistency<String, String>> inconsistencies);
-
-    /**
-     * Returns the extended inconsistencies. If no extended inconsistencies are set, the basic inconsistencies are
-     * returned.
-     *
-     * @param modelType
-     *                  The model type to get the inconsistencies for.
-     * @return The extended inconsistencies.
-     */
-    List<Inconsistency<String, String>> getExtendedInconsistencies(ModelType modelType);
-}
diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/DiagramModelLinkState.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/DiagramModelLinkState.java
deleted file mode 100644
index e4f4ced87..000000000
--- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/DiagramModelLinkState.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Licensed under MIT 2023. */
-package edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency;
-
-import org.eclipse.collections.api.bimap.MutableBiMap;
-
-import edu.kit.kastel.mcse.ardoco.core.api.models.ModelType;
-import edu.kit.kastel.mcse.ardoco.core.data.PipelineStepData;
-
-/**
- * Stores all results of the matching process.
- */
-public interface DiagramModelLinkState extends PipelineStepData {
-    /**
-     * The ID of this state.
-     */
-    String ID = "DiagramModelLinkState";
-
-    /**
-     * Adds a link between a diagram element and a model element.
-     *
-     * @param modelType
-     *                  The model type of the model in which the model element is located.
-     * @param diagramID
-     *                  The ID of the diagram element.
-     * @param modelID
-     *                  The ID of the model element.
-     */
-    void addLink(ModelType modelType, String diagramID, String modelID);
-
-    /**
-     * Get all currently stored links between the diagram and a model.
-     *
-     * @param modelType
-     *                  The type of the model.
-     * @return The links.
-     */
-    MutableBiMap<String, String> getLinks(ModelType modelType);
-}
diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/DiagramState.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/DiagramState.java
deleted file mode 100644
index 41eafae42..000000000
--- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/DiagramState.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Licensed under MIT 2023. */
-package edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency;
-
-import edu.kit.kastel.mcse.ardoco.core.api.diagramrecognition.Diagram;
-import edu.kit.kastel.mcse.ardoco.core.data.PipelineStepData;
-
-/**
- * Contains the loaded diagram.
- */
-public interface DiagramState extends PipelineStepData {
-    /**
-     * The ID in the data repository.
-     */
-    String ID = "DiagramStateData";
-
-    /**
-     * Returns the diagram.
-     *
-     * @return The diagram. May be null.
-     */
-    Diagram getDiagram();
-
-    /**
-     * Sets the diagram. Overwrites the old diagram.
-     *
-     * @param diagram
-     *                The diagram.
-     */
-    void setDiagram(Diagram diagram);
-}
diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/DiagramUtility.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/DiagramUtility.java
deleted file mode 100644
index 2c9b33d66..000000000
--- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/DiagramUtility.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/* Licensed under MIT 2023-2024. */
-package edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common;
-
-import java.util.List;
-import java.util.SortedMap;
-import java.util.TreeMap;
-import java.util.UUID;
-import java.util.stream.Collectors;
-
-import edu.kit.kastel.mcse.ardoco.core.api.diagramrecognition.Box;
-import edu.kit.kastel.mcse.ardoco.core.api.diagramrecognition.Connector;
-import edu.kit.kastel.mcse.ardoco.core.api.diagramrecognition.Diagram;
-import edu.kit.kastel.mcse.ardoco.core.api.diagramrecognition.TextBox;
-import edu.kit.kastel.mcse.ardoco.core.architecture.Deterministic;
-
-/**
- * This class contains utility methods to use with the diagram interface.
- */
-@Deterministic
-public class DiagramUtility {
-    private DiagramUtility() {
-    }
-
-    /**
-     * Checks if there is a connection between the two boxes.
-     * 
-     * @param diagram The diagram in which the boxes are located.
-     * @param source  The source box.
-     * @param target  The target box.
-     * @return True if there is a connection between the two boxes, false otherwise.
-     */
-    public static boolean hasConnectionBetween(Diagram diagram, Box source, Box target) {
-        return diagram.getConnectors().stream().anyMatch(connector -> isConnectionBetween(connector, source, target));
-    }
-
-    /**
-     * Checks if the connector connects the two boxes.
-     * 
-     * @param connector The connector to check.
-     * @param source    The source box.
-     * @param target    The target box.
-     * @return True if the connector connects the two boxes, false otherwise.
-     */
-    public static boolean isConnectionBetween(Connector connector, Box source, Box target) {
-        List<String> connectedBoxes = connector.getConnectedBoxes();
-        return connectedBoxes.get(0).equals(source.getUUID()) && connectedBoxes.contains(target.getUUID());
-    }
-
-    /**
-     * Returns all connectors that are outgoing from the box.
-     * 
-     * @param diagram The diagram in which the box is located.
-     * @param box     The box.
-     * @return All connectors that are outgoing from the box.
-     */
-    public static List<Connector> getOutgoingConnectors(Diagram diagram, Box box) {
-        return diagram.getConnectors().stream().filter(connector -> connector.getConnectedBoxes().get(0).equals(box.getUUID())).toList();
-    }
-
-    /**
-     * Get a map of all boxes in the diagram.
-     * 
-     * @param diagram The diagram.
-     * @return A map from the UUID of the box to the box.
-     */
-    public static SortedMap<String, Box> getBoxes(Diagram diagram) {
-        return diagram.getBoxes().stream().collect(Collectors.toMap(Box::getUUID, box -> box, (a, b) -> b, TreeMap::new));
-    }
-
-    /**
-     * Get the targets of the connector.
-     *
-     * @param connector The connector.
-     * @param boxes     A UUID-box map.
-     * @return The targets of the connector.
-     */
-    public static List<Box> getTargets(Connector connector, SortedMap<String, Box> boxes) {
-        return connector.getConnectedBoxes().stream().skip(1).map(boxes::get).toList();
-    }
-
-    /**
-     * Get the text of the box.
-     * 
-     * @param box The box.
-     * @return The text of the box.
-     */
-    public static String getBoxText(Box box) {
-        return box.getTexts().stream().map(TextBox::getText).collect(Collectors.joining(" "));
-    }
-
-    /**
-     * Get the contained boxes of the box.
-     * 
-     * @param box   The box.
-     * @param boxes A UUID-box map.
-     * @return The contained boxes of the box.
-     */
-    public static List<Box> getContainedBoxes(Box box, SortedMap<String, Box> boxes) {
-        return box.getContainedBoxes().stream().map(boxes::get).toList();
-    }
-
-    /**
-     * Add a box to the diagram.
-     * 
-     * @param diagram The diagram.
-     * @param text    The text of the box.
-     * @return The added box.
-     */
-    public static Box addBox(Diagram diagram, String text) {
-        TextBox textBox = new TextBox(0, 0, 0, 0, 1.0, text, null);
-        Box box = new Box(diagram, String.valueOf(diagram.getBoxes().size()), new int[] { 0, 0, 0, 0 }, 1.0, null, List.of(textBox), null);
-
-        diagram.addBox(box);
-        return box;
-    }
-
-    /**
-     * Add a connector between the two boxes.
-     * 
-     * @param diagram The diagram in which the boxes are located.
-     * @param source  The source box.
-     * @param target  The target box.
-     */
-    public static void addConnector(Diagram diagram, Box source, Box target) {
-        diagram.addConnector(new Connector(UUID.randomUUID().toString(), List.of(source.getUUID(), target.getUUID()), List.of()));
-    }
-}
diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/Edge.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/Edge.java
deleted file mode 100644
index d6b7545a3..000000000
--- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/Edge.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Licensed under MIT 2023. */
-package edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common;
-
-import org.jgrapht.graph.DefaultEdge;
-
-import edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common.similarityflooding.LabeledEdge;
-
-/**
- * The edge type used in the graphs that are matched.
- */
-public class Edge extends DefaultEdge implements LabeledEdge<Label> {
-    private final Label label;
-
-    /**
-     * Creates a new edge with the given label.
-     *
-     * @param label
-     *              The label of the edge.
-     */
-    public Edge(Label label) {
-        this.label = label;
-    }
-
-    @Override
-    public Label getLabel() {
-        return this.label;
-    }
-
-    /**
-     * Performs a copy of the edge.
-     *
-     * @return The copy.
-     */
-    public Edge copy() {
-        return new Edge(this.label);
-    }
-}
diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/ElementRole.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/ElementRole.java
deleted file mode 100644
index ba09f7238..000000000
--- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/ElementRole.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Licensed under MIT 2023. */
-package edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-/**
- * The role a diagram element can have in displaying a model element.
- */
-public enum ElementRole {
-    /**
-     * The element displays a component in the architecture.
-     */
-    @JsonProperty("architecture:component") ARCHITECTURE_COMPONENT,
-    /**
-     * The element displays an interface in the architecture.
-     */
-    @JsonProperty("architecture:interface") ARCHITECTURE_INTERFACE,
-    /**
-     * The element displays a class in the code.
-     */
-    @JsonProperty("code:class") CODE_CLASS,
-    /**
-     * The element displays an interface in the code.
-     */
-    @JsonProperty("code:interface") CODE_INTERFACE,
-    /**
-     * The element displays a package in the code.
-     */
-    @JsonProperty("code:package") CODE_PACKAGE,
-}
diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/Extractions.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/Extractions.java
deleted file mode 100644
index e5da370ce..000000000
--- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/Extractions.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/* Licensed under MIT 2023. */
-package edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common;
-
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.Map;
-import java.util.Set;
-
-import edu.kit.kastel.mcse.ardoco.core.api.models.Entity;
-import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.ArchitectureModel;
-import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.CodeModel;
-import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.Model;
-import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.architecture.ArchitectureComponent;
-import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.architecture.ArchitectureInterface;
-import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.architecture.ArchitectureItem;
-import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.code.*;
-import edu.kit.kastel.mcse.ardoco.core.architecture.Deterministic;
-
-/**
- * Utility to extract elements from models.
- */
-@Deterministic
-public final class Extractions {
-    private Extractions() {
-    }
-
-    /**
-     * Extracts all (relevant) items from a given architecture model.
-     *
-     * @param model
-     *              The architecture model.
-     * @return A map, giving all items that fulfill a certain role.
-     */
-    public static Map<ElementRole, Set<ArchitectureItem>> extractItemsFromModel(ArchitectureModel model) {
-        Set<ArchitectureComponent> components = new LinkedHashSet<>();
-        Set<ArchitectureInterface> interfaces = new LinkedHashSet<>();
-
-        for (ArchitectureItem item : model.getEndpoints()) {
-            if (item instanceof ArchitectureComponent component) {
-                components.add(component);
-
-                interfaces.addAll(component.getProvidedInterfaces());
-                interfaces.addAll(component.getRequiredInterfaces());
-            }
-        }
-
-        return Map.of(ElementRole.ARCHITECTURE_COMPONENT, Set.copyOf(components), ElementRole.ARCHITECTURE_INTERFACE, Set.copyOf(interfaces));
-    }
-
-    /**
-     * Extracts all (relevant) items from a given code model.
-     *
-     * @param model
-     *              The code model.
-     * @return A map, giving all items that fulfill a certain role.
-     */
-    public static Map<ElementRole, Set<CodeItem>> extractItemsFromModel(CodeModel model) {
-        Set<CodePackage> packages = new LinkedHashSet<>();
-        Set<ClassUnit> classes = new LinkedHashSet<>();
-        Set<InterfaceUnit> interfaces = new LinkedHashSet<>();
-
-        extractPackagesFromModel(model, packages);
-
-        for (CodePackage codePackage : packages) {
-            extractItemsFromPackage(codePackage, classes, interfaces);
-        }
-
-        return Map.of(ElementRole.CODE_PACKAGE, Set.copyOf(packages), ElementRole.CODE_CLASS, Set.copyOf(classes), ElementRole.CODE_INTERFACE, Set.copyOf(
-                interfaces));
-    }
-
-    private static void extractPackagesFromModel(CodeModel model, Set<CodePackage> packages) {
-        for (CodeItem item : model.getContent()) {
-            if (item instanceof CodePackage codePackage) {
-                packages.add(codePackage);
-                packages.addAll(codePackage.getAllPackages());
-            }
-        }
-    }
-
-    private static void extractItemsFromPackage(CodePackage codePackage, Set<ClassUnit> classes, Set<InterfaceUnit> interfaces) {
-        for (CodeCompilationUnit compilationUnit : codePackage.getCompilationUnits()) {
-            for (Datatype datatype : compilationUnit.getAllDataTypes()) {
-                if (datatype instanceof ClassUnit classUnit) {
-                    classes.add(classUnit);
-                }
-
-                if (datatype instanceof InterfaceUnit interfaceUnit) {
-                    interfaces.add(interfaceUnit);
-                }
-            }
-        }
-    }
-
-    private static String getDatatypePath(Datatype datatype) {
-        if (datatype.getParentDatatype() != null) {
-            return getDatatypePath(datatype.getParentDatatype()) + "." + datatype.getName();
-        } else {
-            return datatype.getName();
-        }
-    }
-
-    /**
-     * Gets the path of the given code item, a unique identifier.
-     *
-     * @param item
-     *             The code item, which is part of a code model.
-     * @return The path of the code item.
-     */
-    public static String getPath(CodeItem item) {
-        if (item instanceof CodeCompilationUnit compilationUnit) {
-            return compilationUnit.getPath();
-        }
-
-        if (item instanceof CodeModule codeModule) {
-            if (codeModule.hasParent()) {
-                return getPath(codeModule.getParent()) + "." + codeModule.getName();
-            } else {
-                return codeModule.getName();
-            }
-        }
-
-        if (item instanceof Datatype datatype) {
-            String packagePath = "";
-            if (datatype.getCompilationUnit().hasParent()) {
-                packagePath = getPath(datatype.getCompilationUnit().getParent()) + ".";
-            }
-
-            return packagePath + getDatatypePath(datatype) + "[" + datatype.getCompilationUnit().getPath() + "]";
-        }
-
-        return null;
-    }
-
-    /**
-     * Extracts all entities from a given model.
-     *
-     * @param model
-     *              The model.
-     * @return A map, giving the entity corresponding to a certain ID or path.
-     */
-    public static Map<String, Entity> extractEntitiesFromModel(Model model) {
-        Map<String, Entity> entities = new LinkedHashMap<>();
-
-        if (model instanceof ArchitectureModel architectureModel) {
-            Transformations.transform(architectureModel, item -> {
-                entities.put(item.getId(), item);
-                return item;
-            }, (from, to) -> {
-            }, (child, parent) -> {
-            });
-        } else if (model instanceof CodeModel codeModel) {
-            Transformations.transform(codeModel, item -> {
-                entities.put(Extractions.getPath(item), item);
-                return item;
-            }, (from, to) -> {
-            }, (child, parent) -> {
-            });
-        } else {
-            throw new IllegalArgumentException("Unknown model type: " + model.getClass());
-        }
-
-        return entities;
-    }
-}
diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/Label.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/Label.java
deleted file mode 100644
index 54c1884e3..000000000
--- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/Label.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Licensed under MIT 2023. */
-package edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common;
-
-/**
- * Edge labels used in the matched graphs representing diagrams and models.
- */
-public enum Label {
-    /**
-     * The edge is a normal edge, representing either a line in a diagram or a normal relation like dependency in a
-     * model.
-     */
-    DEFAULT,
-    /**
-     * The edge represents a hierarchy relation. It is used for 'inside'-relations in diagrams, thus the source is
-     * lower than the target in the hierarchy.
-     */
-    HIERARCHY,
-}
diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/TextSimilarity.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/TextSimilarity.java
deleted file mode 100644
index 703ec9aa9..000000000
--- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/TextSimilarity.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/* Licensed under MIT 2023. */
-package edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import org.apache.commons.text.similarity.JaccardSimilarity;
-import org.apache.commons.text.similarity.JaroWinklerSimilarity;
-import org.apache.commons.text.similarity.LevenshteinDistance;
-import org.jgrapht.alg.util.UnorderedPair;
-
-import edu.kit.kastel.mcse.ardoco.core.architecture.Deterministic;
-
-/**
- * Utility to get the similarity of two texts.
- */
-@Deterministic
-public final class TextSimilarity {
-    private static final Map<UnorderedPair<String, String>, Double> CACHE_FOR_BASIC_FUNCTION = new LinkedHashMap<>();
-    private static final Map<UnorderedPair<String, String>, Double> CACHE_FOR_CASE_INSENSITIVE_FUNCTION = new LinkedHashMap<>();
-    private static final JaroWinklerSimilarity JARO_WINKLER_SIMILARITY = new JaroWinklerSimilarity();
-    private static final Map<UnorderedPair<String, String>, Double> CACHE_FOR_JARO_WINKLER_FUNCTION = new LinkedHashMap<>();
-    private static final JaccardSimilarity JACCARD_SIMILARITY = new JaccardSimilarity();
-    private static final Map<UnorderedPair<String, String>, Double> CACHE_FOR_JACCARD_FUNCTION = new LinkedHashMap<>();
-
-    private TextSimilarity() {
-    }
-
-    /**
-     * Get the similarity of two texts.
-     *
-     * @param textA
-     *              The first text.
-     * @param textB
-     *              The second text.
-     * @return The similarity of the two texts, in the range [0, 1].
-     */
-    public static double byLevenshtein(String textA, String textB) {
-        return CACHE_FOR_BASIC_FUNCTION.computeIfAbsent(new UnorderedPair<>(textA, textB), pair -> {
-            LevenshteinDistance algorithm = LevenshteinDistance.getDefaultInstance();
-
-            double maxDistance = Math.max(pair.getFirst().length(), pair.getSecond().length());
-            double levenshteinDistance = algorithm.apply(pair.getFirst(), pair.getSecond());
-
-            return 1 - (levenshteinDistance / maxDistance);
-        });
-    }
-
-    /**
-     * Get the similarity of two texts after converting them to lower case.
-     *
-     * @param textA
-     *              The first text.
-     * @param textB
-     *              The second text.
-     * @return The similarity of the two texts, in the range [0, 1].
-     */
-    public static double byLevenshteinCaseInsensitive(String textA, String textB) {
-        return CACHE_FOR_CASE_INSENSITIVE_FUNCTION.computeIfAbsent(new UnorderedPair<>(textA, textB), pair -> {
-            LevenshteinDistance algorithm = LevenshteinDistance.getDefaultInstance();
-
-            double maxDistance = Math.max(pair.getFirst().length(), pair.getSecond().length());
-            double levenshteinDistance = algorithm.apply(pair.getFirst().toLowerCase(), pair.getSecond().toLowerCase());
-
-            return 1 - (levenshteinDistance / maxDistance);
-        });
-    }
-
-    /**
-     * Get the similarity of two texts using the Jaro-Winkler algorithm after converting them to lower case.
-     *
-     * @param textA
-     *              The first text.
-     * @param textB
-     *              The second text.
-     * @return The similarity of the two texts, in the range [0, 1].
-     */
-    public static double byJaroWinkler(String textA, String textB) {
-        return CACHE_FOR_JARO_WINKLER_FUNCTION.computeIfAbsent(new UnorderedPair<>(textA, textB), pair -> JARO_WINKLER_SIMILARITY.apply(pair.getFirst()
-                .toLowerCase(), pair.getSecond().toLowerCase()));
-    }
-
-    /**
-     * Get the similarity of two texts using the Jaccard algorithm after converting them to lower case.
-     *
-     * @param textA
-     *              The first text.
-     * @param textB
-     *              The second text.
-     * @return The similarity of the two texts, in the range [0, 1].
-     */
-    public static double byJaccard(String textA, String textB) {
-        return CACHE_FOR_JACCARD_FUNCTION.computeIfAbsent(new UnorderedPair<>(textA, textB), pair -> JACCARD_SIMILARITY.apply(pair.getFirst().toLowerCase(),
-                pair.getSecond().toLowerCase()));
-    }
-}
diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/Transformations.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/Transformations.java
deleted file mode 100644
index 5c68d4883..000000000
--- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/Transformations.java
+++ /dev/null
@@ -1,343 +0,0 @@
-/* Licensed under MIT 2023. */
-package edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.SortedMap;
-import java.util.function.BiConsumer;
-import java.util.function.Function;
-
-import org.jgrapht.Graph;
-import org.jgrapht.graph.DefaultEdge;
-import org.jgrapht.graph.DirectedMultigraph;
-
-import edu.kit.kastel.mcse.ardoco.core.api.diagramrecognition.Box;
-import edu.kit.kastel.mcse.ardoco.core.api.diagramrecognition.Connector;
-import edu.kit.kastel.mcse.ardoco.core.api.diagramrecognition.Diagram;
-import edu.kit.kastel.mcse.ardoco.core.api.models.Entity;
-import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.ArchitectureModel;
-import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.CodeModel;
-import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.Model;
-import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.architecture.ArchitectureComponent;
-import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.architecture.ArchitectureInterface;
-import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.architecture.ArchitectureItem;
-import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.code.CodeCompilationUnit;
-import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.code.CodeItem;
-import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.code.CodePackage;
-import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.code.Datatype;
-import edu.kit.kastel.mcse.ardoco.core.architecture.Deterministic;
-
-/**
- * Utility to transform diagrams and models to graphs.
- */
-@Deterministic
-public final class Transformations {
-    private Transformations() {
-
-    }
-
-    /**
-     * Transforms a diagram to a graph.
-     *
-     * @param diagram
-     *                The diagram to transform.
-     * @return The graph.
-     */
-    public static DirectedMultigraph<Vertex<Box>, Edge> toGraph(Diagram diagram) {
-        DirectedMultigraph<Vertex<Box>, Edge> graph = new DirectedMultigraph<>(null, null, false);
-        Map<Box, Vertex<Box>> boxToVertex = new LinkedHashMap<>();
-
-        for (Box box : diagram.getBoxes()) {
-            Vertex<Box> vertex = new Vertex<>(box, DiagramUtility.getBoxText(box));
-
-            graph.addVertex(vertex);
-            boxToVertex.put(box, vertex);
-        }
-
-        SortedMap<String, Box> boxes = DiagramUtility.getBoxes(diagram);
-        for (Vertex<Box> vertex : graph.vertexSet()) {
-            Box represented = Objects.requireNonNull(vertex.getRepresented());
-
-            for (Connector connector : DiagramUtility.getOutgoingConnectors(diagram, represented)) {
-                for (Box target : DiagramUtility.getTargets(connector, boxes)) {
-                    graph.addEdge(vertex, boxToVertex.get(target), new Edge(Label.DEFAULT));
-                }
-            }
-
-            for (Box contained : DiagramUtility.getContainedBoxes(represented, boxes)) {
-                graph.addEdge(boxToVertex.get(contained), vertex, new Edge(Label.HIERARCHY));
-            }
-        }
-
-        return graph;
-    }
-
-    /**
-     * Transforms an architecture model to a graph.
-     *
-     * @param model
-     *              The architecture model to transform.
-     * @return The graph.
-     */
-    public static DirectedMultigraph<Vertex<ArchitectureItem>, Edge> toGraph(ArchitectureModel model) {
-        DirectedMultigraph<Vertex<ArchitectureItem>, Edge> graph = new DirectedMultigraph<>(null, null, false);
-
-        transform(model, item -> {
-            Vertex<ArchitectureItem> vertex = new Vertex<>(item, item.getName());
-            graph.addVertex(vertex);
-            return vertex;
-        }, (source, target) -> graph.addEdge(source, target, new Edge(Label.DEFAULT)), (child, parent) -> graph.addEdge(child, parent, new Edge(
-                Label.HIERARCHY)));
-
-        return graph;
-    }
-
-    /**
-     * Transforms an architecture model to a graph.
-     *
-     * @param model
-     *                          The architecture model to transform.
-     * @param vertexSupplier
-     *                          A function that creates a vertex from an architecture item.
-     * @param edgeConsumer
-     *                          A function that adds a default edge to the graph.
-     * @param hierarchyConsumer
-     *                          A function that adds a hierarchy edge to the graph.
-     * @param <V>
-     *                          The type of the vertices.
-     */
-    public static <V> void transform(ArchitectureModel model, Function<ArchitectureItem, V> vertexSupplier, BiConsumer<V, V> edgeConsumer,
-            BiConsumer<V, V> hierarchyConsumer) {
-        Map<ArchitectureInterface, List<ArchitectureComponent>> providers = new LinkedHashMap<>();
-        Map<ArchitectureComponent, V> components = new LinkedHashMap<>();
-
-        for (ArchitectureItem item : model.getEndpoints()) {
-            transformItemIfComponent(vertexSupplier, item, components, providers);
-        }
-
-        for (var entry : components.entrySet()) {
-            ArchitectureComponent component = entry.getKey();
-            V componentVertex = entry.getValue();
-
-            transformDependenciesToEdges(edgeConsumer, component, providers, components, componentVertex);
-            transformContainmentToEdges(hierarchyConsumer, component, components, componentVertex);
-        }
-    }
-
-    private static <V> void transformDependenciesToEdges(BiConsumer<V, V> edgeConsumer, ArchitectureComponent component,
-            Map<ArchitectureInterface, List<ArchitectureComponent>> providers, Map<ArchitectureComponent, V> components, V componentVertex) {
-        for (ArchitectureInterface required : component.getRequiredInterfaces()) {
-            for (ArchitectureComponent provider : providers.getOrDefault(required, List.of())) {
-                if (component.equals(provider)) {
-                    continue;
-                }
-
-                V providerVertex = components.get(provider);
-                edgeConsumer.accept(componentVertex, providerVertex);
-            }
-        }
-    }
-
-    private static <V> void transformContainmentToEdges(BiConsumer<V, V> hierarchyConsumer, ArchitectureComponent component,
-            Map<ArchitectureComponent, V> components, V componentVertex) {
-        for (ArchitectureComponent subcomponent : component.getSubcomponents()) {
-            V subcomponentVertex = components.get(subcomponent);
-            hierarchyConsumer.accept(subcomponentVertex, componentVertex);
-        }
-    }
-
-    private static <V> void transformItemIfComponent(Function<ArchitectureItem, V> vertexSupplier, ArchitectureItem item,
-            Map<ArchitectureComponent, V> components, Map<ArchitectureInterface, List<ArchitectureComponent>> providers) {
-        if (item instanceof ArchitectureComponent component) {
-            V vertex = vertexSupplier.apply(component);
-            components.put(component, vertex);
-
-            for (ArchitectureInterface provided : component.getProvidedInterfaces()) {
-                providers.computeIfAbsent(provided, k -> new ArrayList<>()).add(component);
-            }
-        }
-    }
-
-    /**
-     * Transforms a code model to a graph.
-     *
-     * @param model
-     *              The code model to transform.
-     * @return The graph.
-     */
-    public static DirectedMultigraph<Vertex<CodeItem>, Edge> toGraph(CodeModel model) {
-        DirectedMultigraph<Vertex<CodeItem>, Edge> graph = new DirectedMultigraph<>(null, null, false);
-
-        transform(model, item -> {
-            Vertex<CodeItem> vertex = new Vertex<>(item, item.getName());
-            graph.addVertex(vertex);
-            return vertex;
-        }, (source, target) -> graph.addEdge(source, target, new Edge(Label.DEFAULT)), (child, parent) -> graph.addEdge(child, parent, new Edge(
-                Label.HIERARCHY)));
-
-        return graph;
-    }
-
-    /**
-     * Transform a code model using provided functions.
-     *
-     * @param model
-     *                          The code model to transform.
-     * @param vertexSupplier
-     *                          A function that creates a vertex from a code item.
-     * @param edgeConsumer
-     *                          A function that adds a default edge to the graph.
-     * @param hierarchyConsumer
-     *                          A function that adds a hierarchy edge to the graph.
-     * @param <V>
-     *                          The type of the vertices.
-     */
-    public static <V> void transform(CodeModel model, Function<CodeItem, V> vertexSupplier, BiConsumer<V, V> edgeConsumer, BiConsumer<V, V> hierarchyConsumer) {
-        Map<CodeItem, V> vertices = new LinkedHashMap<>();
-        Graph<CodePackage, DefaultEdge> packages = new DirectedMultigraph<>(DefaultEdge.class);
-
-        transformItemsIfPackage(model, packages);
-
-        Map<Datatype, CodePackage> types = new LinkedHashMap<>();
-
-        for (CodePackage codePackage : packages.vertexSet()) {
-            V packageVertex = vertexSupplier.apply(codePackage);
-            vertices.put(codePackage, packageVertex);
-
-            for (CodeCompilationUnit compilationUnit : codePackage.getCompilationUnits()) {
-                transformItemsFromCompilationUnits(vertexSupplier, codePackage, compilationUnit, types, vertices);
-                transformHierarchyOfDatatypesToEdges(hierarchyConsumer, compilationUnit, vertices, packageVertex);
-            }
-        }
-
-        for (Map.Entry<Datatype, CodePackage> entry : types.entrySet()) {
-            Datatype datatype = entry.getKey();
-            V datatypeVertex = vertices.get(datatype);
-            CodePackage datatypePackage = entry.getValue();
-
-            transformInheritanceAndImplementationToEdges(edgeConsumer, datatype, vertices, datatypeVertex);
-            transformDatatypeReferencesToEdges(edgeConsumer, datatype, vertices, datatypeVertex, types, datatypePackage, packages);
-        }
-
-        transformPackageReferencesToEdges(edgeConsumer, packages, vertices);
-        transformPackageHierarchyReferencesToEdges(hierarchyConsumer, packages, vertices);
-    }
-
-    private static <V> void transformPackageHierarchyReferencesToEdges(BiConsumer<V, V> hierarchyConsumer, Graph<CodePackage, DefaultEdge> packages,
-            Map<CodeItem, V> vertices) {
-        for (CodePackage codePackage : packages.vertexSet()) {
-            if (codePackage.hasParent()) {
-                V parentPackageVertex = vertices.get(codePackage.getParent());
-                V packageVertex = vertices.get(codePackage);
-                hierarchyConsumer.accept(packageVertex, parentPackageVertex);
-            }
-        }
-    }
-
-    private static <V> void transformPackageReferencesToEdges(BiConsumer<V, V> edgeConsumer, Graph<CodePackage, DefaultEdge> packages,
-            Map<CodeItem, V> vertices) {
-        for (CodePackage codePackage : packages.vertexSet()) {
-            for (CodePackage otherPackage : packages.vertexSet()) {
-                if (codePackage.equals(otherPackage)) {
-                    continue;
-                }
-
-                if (packages.containsEdge(codePackage, otherPackage)) {
-                    edgeConsumer.accept(vertices.get(codePackage), vertices.get(otherPackage));
-                }
-            }
-        }
-    }
-
-    private static <V> void transformDatatypeReferencesToEdges(BiConsumer<V, V> edgeConsumer, Datatype datatype, Map<CodeItem, V> vertices, V datatypeVertex,
-            Map<Datatype, CodePackage> types, CodePackage datatypePackage, Graph<CodePackage, DefaultEdge> packages) {
-        for (Datatype reference : datatype.getDatatypeReferences()) {
-            V referenceVertex = vertices.get(reference);
-            if (Objects.equals(datatype, reference) || referenceVertex == null) {
-                continue;
-            }
-            edgeConsumer.accept(datatypeVertex, referenceVertex);
-
-            CodePackage referencePackage = types.get(reference);
-            if (!Objects.equals(datatypePackage, referencePackage)) {
-                packages.addEdge(datatypePackage, referencePackage);
-            }
-        }
-    }
-
-    private static <V> void transformInheritanceAndImplementationToEdges(BiConsumer<V, V> edgeConsumer, Datatype datatype, Map<CodeItem, V> vertices,
-            V datatypeVertex) {
-        for (Datatype extended : datatype.getExtendedTypes()) {
-            V extendedVertex = vertices.get(extended);
-            edgeConsumer.accept(datatypeVertex, extendedVertex);
-        }
-
-        for (Datatype implemented : datatype.getImplementedTypes()) {
-            V implementedVertex = vertices.get(implemented);
-            edgeConsumer.accept(datatypeVertex, implementedVertex);
-        }
-    }
-
-    private static <V> void transformHierarchyOfDatatypesToEdges(BiConsumer<V, V> hierarchyConsumer, CodeCompilationUnit compilationUnit,
-            Map<CodeItem, V> vertices, V packageVertex) {
-        for (Datatype datatype : compilationUnit.getAllDataTypes()) {
-            Datatype parentDatatype = datatype.getParentDatatype();
-            V parentDatatypeVertex = vertices.get(parentDatatype);
-            V datatypeVertex = vertices.get(datatype);
-
-            if (parentDatatype != null) {
-                hierarchyConsumer.accept(datatypeVertex, parentDatatypeVertex);
-            } else {
-                hierarchyConsumer.accept(datatypeVertex, packageVertex);
-            }
-        }
-    }
-
-    private static <V> void transformItemsFromCompilationUnits(Function<CodeItem, V> vertexSupplier, CodePackage codePackage,
-            CodeCompilationUnit compilationUnit, Map<Datatype, CodePackage> types, Map<CodeItem, V> vertices) {
-        for (Datatype datatype : compilationUnit.getAllDataTypes()) {
-            types.put(datatype, codePackage);
-
-            V datatypeVertex = vertexSupplier.apply(datatype);
-            vertices.put(datatype, datatypeVertex);
-        }
-    }
-
-    private static void transformItemsIfPackage(CodeModel model, Graph<CodePackage, DefaultEdge> packages) {
-        for (CodeItem item : model.getContent()) {
-            if (item instanceof CodePackage codePackage) {
-                packages.addVertex(codePackage);
-                for (CodePackage subpackage : codePackage.getAllPackages()) {
-                    packages.addVertex(subpackage);
-                }
-            }
-        }
-    }
-
-    /**
-     * Transform any known model type using provided functions.
-     *
-     * @param model
-     *                          The model to transform.
-     * @param vertexSupplier
-     *                          A function that creates a vertex from an entity.
-     * @param edgeConsumer
-     *                          A function that adds a default edge to the graph.
-     * @param hierarchyConsumer
-     *                          A function that adds a hierarchy edge to the graph.
-     * @param <V>
-     *                          The type of the vertices.
-     */
-    public static <V> void transformAny(Model model, Function<Entity, V> vertexSupplier, BiConsumer<V, V> edgeConsumer, BiConsumer<V, V> hierarchyConsumer) {
-        if (model instanceof ArchitectureModel architectureModel) {
-            transform(architectureModel, vertexSupplier::apply, edgeConsumer, hierarchyConsumer);
-        } else if (model instanceof CodeModel codeModel) {
-            transform(codeModel, vertexSupplier::apply, edgeConsumer, hierarchyConsumer);
-        } else {
-            throw new IllegalArgumentException("Unknown model type: " + model.getClass());
-        }
-    }
-}
diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/Vertex.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/Vertex.java
deleted file mode 100644
index 9e1651ac1..000000000
--- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/Vertex.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/* Licensed under MIT 2023. */
-package edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common;
-
-/**
- * The vertex type used in the graphs that are matched.
- *
- * @param <T>
- *            The element type, which is the original element that the vertex represents, e.g. a Box or a element from the
- *            model.
- */
-public final class Vertex<T> {
-
-    private final T represented;
-    private String name;
-
-    /**
-     * @param represented
-     *                    The element that the vertex represents.
-     * @param name
-     *                    The name of the vertex, which is used for matching.
-     */
-    public Vertex(T represented, String name) {
-        this.represented = represented;
-        this.name = name;
-    }
-
-    /**
-     * Get the element that the vertex represents.
-     *
-     * @return The element that the vertex represents.
-     */
-
-    public T getRepresented() {
-        return this.represented;
-    }
-
-    /**
-     * Get the name of the vertex, which is used for matching.
-     *
-     * @return The name of the vertex, which is used for matching.
-     */
-    public String getName() {
-        return this.name;
-    }
-
-    /**
-     * Set the name of the vertex.
-     *
-     * @param newName
-     *                The new name of the vertex.
-     */
-    public void rename(String newName) {
-        this.name = newName;
-    }
-
-    /**
-     * Creates a copy of the vertex.
-     *
-     * @return The copy of the vertex.
-     */
-    public Vertex<T> copy() {
-        return new Vertex<>(this.represented, this.name);
-    }
-}
diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/WeightedTextSimilarity.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/WeightedTextSimilarity.java
deleted file mode 100644
index 9e7e291cb..000000000
--- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/WeightedTextSimilarity.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/* Licensed under MIT 2023. */
-package edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Stream;
-
-import org.apache.commons.lang3.StringUtils;
-import org.jgrapht.alg.util.UnorderedPair;
-
-import edu.kit.kastel.mcse.ardoco.core.architecture.Deterministic;
-
-/**
- * A text similarity function that assigns weights to specific words.
- */
-@Deterministic
-public class WeightedTextSimilarity {
-    private static final String ALPHA_NUMERIC_PATTERN = "[a-zA-Z0-9]+";
-    private final Map<UnorderedPair<String, String>, Double> cache = new java.util.LinkedHashMap<>();
-    private final Map<String, Double> weights;
-
-    /**
-     * Create a new weighted text similarity function.
-     *
-     * @param weights
-     *                The weights to use for words.
-     */
-    public WeightedTextSimilarity(Map<String, Double> weights) {
-        this.weights = weights;
-    }
-
-    /**
-     * Get all words in a text or identifier, taking camel case into account.
-     *
-     * @param text
-     *             The text.
-     * @return A stream of words.
-     */
-    public static Stream<String> getWords(String text) {
-        return Arrays.stream(StringUtils.splitByCharacterTypeCamelCase(text)).filter(s -> s.matches(ALPHA_NUMERIC_PATTERN)).map(String::toLowerCase);
-    }
-
-    private static double getMaxLength(List<String> words) {
-        double length = 0.0;
-        for (String word : words) {
-            length = Math.max(length, word.length());
-        }
-        return length;
-    }
-
-    /**
-     * Get the similarity of two texts using a Jaccard-based algorithm operating on words after converting them to lower
-     * case. Word equality is determined using the levenshtein distance.
-     *
-     * @param textA
-     *              The first text.
-     * @param textB
-     *              The second text.
-     * @return The similarity of the two texts, in the range [0, 1].
-     */
-    public double apply(String textA, String textB) {
-        return this.cache.computeIfAbsent(new UnorderedPair<>(textA, textB), pair -> this.calculate(pair.getFirst(), pair.getSecond()));
-    }
-
-    private double calculate(String textA, String textB) {
-        List<String> a = getWords(textA).toList();
-        List<String> b = getWords(textB).toList();
-
-        if (a.size() <= 1 && b.size() <= 1) {
-            return TextSimilarity.byLevenshteinCaseInsensitive(textA, textB);
-        }
-
-        if (a.isEmpty() || b.isEmpty()) {
-            return 0.0;
-        }
-
-        double maxA = getMaxLength(a);
-        double maxB = getMaxLength(b);
-
-        if (maxA == 0 || maxB == 0) {
-            return 0.0;
-        }
-
-        double sizeA = this.getSimilaritySize(a, maxA);
-        double sizeB = this.getSimilaritySize(b, maxB);
-
-        double intersection = this.getSimilaritySize(a, maxA, b, maxB);
-        double union = sizeA + sizeB - intersection;
-
-        if (union == 0) {
-            return 1.0;
-        }
-
-        return intersection / union;
-    }
-
-    private double getSimilaritySize(List<String> a, double longestInA) {
-        return this.getSimilaritySize(a, longestInA, a, longestInA);
-    }
-
-    private double getSimilaritySize(List<String> a, double maxA, List<String> b, double maxB) {
-        double size = 0.0;
-        for (String wordA : a) {
-            double lengthWeightA = wordA.length() / maxA;
-            double assignedWeightA = this.weights.getOrDefault(wordA, 1.0);
-            for (String wordB : b) {
-                double lengthWeightB = wordB.length() / maxB;
-                double assignedWeightB = this.weights.getOrDefault(wordB, 1.0);
-                size += TextSimilarity.byLevenshtein(wordA, wordB) * lengthWeightA * lengthWeightB * assignedWeightA * assignedWeightB;
-            }
-        }
-        return size;
-    }
-}
diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/HierarchyInconsistency.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/HierarchyInconsistency.java
deleted file mode 100644
index 66b7e0a65..000000000
--- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/HierarchyInconsistency.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/* Licensed under MIT 2023. */
-package edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common.inconsistencies;
-
-import java.util.Objects;
-import java.util.function.Function;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-/**
- * Indicates that the hierarchy is inconsistent, meaning the parent of a box is not as expected.
- * 
- * @param <B> The type of the box.
- * @param <E> The type of the entity.
- */
-public class HierarchyInconsistency<B, E> extends Inconsistency<B, E> {
-    private final B expectedParent;
-
-    /**
-     * Creates a new NameInconsistency.
-     *
-     * @param box
-     *                       The box that is inconsistent.
-     * @param entity
-     *                       The entity that is inconsistent.
-     * @param expectedParent
-     *                       The expected parent of the box.
-     */
-    public HierarchyInconsistency(B box, E entity, B expectedParent) {
-        super(box, entity);
-        this.expectedParent = expectedParent;
-    }
-
-    @Override
-    public <R, M> Inconsistency<R, M> map(Function<B, R> boxMapper, Function<E, M> entityMapper) {
-        return new HierarchyInconsistency<>(boxMapper.apply(this.getBox()), entityMapper.apply(this.getEntity()), this.getExpectedParent() == null ?
-                null :
-                boxMapper.apply(this.getExpectedParent()));
-    }
-
-    /**
-     * The expected parent of the box.
-     *
-     * @return The expected parent of the box.
-     */
-    public B getExpectedParent() {
-        return this.expectedParent;
-    }
-
-    @Override
-    public B getOtherBox() {
-        return this.getExpectedParent();
-    }
-
-    @Override
-    public InconsistencyType getType() {
-        return InconsistencyType.HIERARCHY_INCONSISTENCY;
-    }
-
-    @Override
-    public boolean equals(Object object) {
-        if (this == object)
-            return true;
-        if (object == null || this.getClass() != object.getClass())
-            return false;
-        if (!super.equals(object))
-            return false;
-        HierarchyInconsistency<?, ?> that = (HierarchyInconsistency<?, ?>) object;
-        return Objects.equals(this.getExpectedParent(), that.getExpectedParent());
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(super.hashCode(), this.getExpectedParent());
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this).append("expectedParent", this.expectedParent).toString();
-    }
-}
diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/Inconsistency.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/Inconsistency.java
deleted file mode 100644
index 255856004..000000000
--- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/Inconsistency.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/* Licensed under MIT 2023. */
-package edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common.inconsistencies;
-
-import java.util.Objects;
-import java.util.function.Function;
-
-/**
- * Base class for all inconsistencies between the diagram and the given models.
- * 
- * @param <B> The type of the box.
- * @param <E> The type of the entity.
- */
-public abstract class Inconsistency<B, E> {
-    private final B box;
-    private final E entity;
-
-    protected Inconsistency(B box, E entity) {
-        this.box = box;
-        this.entity = entity;
-    }
-
-    /**
-     * Map the inconsistency to the same inconsistency type with different box and entity types.
-     *
-     * @param boxMapper
-     *                     The mapper for the box.
-     * @param entityMapper
-     *                     The mapper for the entity.
-     * @param <R>
-     *                     The type of the box (representation) of the mapped inconsistency.
-     * @param <M>
-     *                     The type of the entity (model) of the mapped inconsistency.
-     * @return The mapped inconsistency.
-     */
-    public abstract <R, M> Inconsistency<R, M> map(Function<B, R> boxMapper, Function<E, M> entityMapper);
-
-    /**
-     * Get the inconsistency type.
-     *
-     * @return The inconsistency type.
-     */
-    public abstract InconsistencyType getType();
-
-    /**
-     * Get the box that is part of the inconsistency.
-     *
-     * @return The box, or null if there is no box.
-     */
-    public B getBox() {
-        return this.box;
-    }
-
-    /**
-     * Get the other box that is part of the inconsistency, if there is one. This is relevant for inconsistencies
-     * related to lines between boxes.
-     *
-     * @return The other box, or null if there is no other box.
-     */
-    public B getOtherBox() {
-        return null;
-    }
-
-    /**
-     * Get the entity that is part of the inconsistency.
-     *
-     * @return The entity, or null if there is no entity.
-     */
-    public E getEntity() {
-        return this.entity;
-    }
-
-    /**
-     * Get the name of the box that is part of the inconsistency.
-     *
-     * @return The name, or null if not a name inconsistency.
-     */
-    public String getActualName() {
-        return null;
-    }
-
-    /**
-     * Get the expected name of the box that is part of the inconsistency.
-     *
-     * @return The expected name, or null if not a name inconsistency.
-     */
-    public String getExpectedName() {
-        return null;
-    }
-
-    @Override
-    public boolean equals(Object object) {
-        if (this == object)
-            return true;
-        if (object == null || this.getClass() != object.getClass())
-            return false;
-        Inconsistency<?, ?> that = (Inconsistency<?, ?>) object;
-        return Objects.equals(this.getBox(), that.getBox()) && Objects.equals(this.getEntity(), that.getEntity());
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(this.getBox(), this.getEntity());
-    }
-}
diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/InconsistencyType.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/InconsistencyType.java
deleted file mode 100644
index 747bd3a30..000000000
--- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/InconsistencyType.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Licensed under MIT 2023. */
-package edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common.inconsistencies;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-/**
- * All supported types of inconsistencies.
- */
-public enum InconsistencyType {
-    /**
-     * The name of the model element is inconsistent between the architecture and the code.
-     */
-    @JsonProperty("name_inconsistency") NAME_INCONSISTENCY,
-    /**
-     * The hierarchy of the model element is inconsistent between the architecture and the code.
-     */
-    @JsonProperty("hierarchy_inconsistency") HIERARCHY_INCONSISTENCY,
-    /**
-     * A line was expected in the diagram but is missing.
-     */
-    @JsonProperty("missing_line") MISSING_LINE,
-    /**
-     * A box was expected in the diagram but is missing.
-     */
-    @JsonProperty("missing_box") MISSING_BOX,
-    /**
-     * A line was found in the diagram but was not expected.
-     */
-    @JsonProperty("unexpected_line") UNEXPECTED_LINE,
-    /**
-     * A box was found in the diagram but was not expected.
-     */
-    @JsonProperty("unexpected_box") UNEXPECTED_BOX,
-}
diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/MissingBoxInconsistency.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/MissingBoxInconsistency.java
deleted file mode 100644
index 77f65a9bc..000000000
--- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/MissingBoxInconsistency.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Licensed under MIT 2023. */
-package edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common.inconsistencies;
-
-import java.util.function.Function;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-/**
- * Indicates that an expected box is not present in the diagram.
- * 
- * @param <B> The type of the box.
- * @param <E> The type of the entity.
- */
-public class MissingBoxInconsistency<B, E> extends Inconsistency<B, E> {
-    /**
-     * Creates a new MissingBoxInconsistency.
-     *
-     * @param entity
-     *               The entity that is not represented in the diagram.
-     */
-    public MissingBoxInconsistency(E entity) {
-        super(null, entity);
-    }
-
-    @Override
-    public <R, M> Inconsistency<R, M> map(Function<B, R> boxMapper, Function<E, M> entityMapper) {
-        return new MissingBoxInconsistency<>(entityMapper.apply(this.getEntity()));
-    }
-
-    @Override
-    public InconsistencyType getType() {
-        return InconsistencyType.MISSING_BOX;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this).toString();
-    }
-}
diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/MissingLineInconsistency.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/MissingLineInconsistency.java
deleted file mode 100644
index 55471b84f..000000000
--- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/MissingLineInconsistency.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/* Licensed under MIT 2023. */
-package edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common.inconsistencies;
-
-import java.util.Objects;
-import java.util.function.Function;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-/**
- * Indicates that a box is missing a line to another box.
- * 
- * @param <B> The type of the box.
- * @param <E> The type of the entity.
- */
-public class MissingLineInconsistency<B, E> extends Inconsistency<B, E> {
-    private final B expectedLineTarget;
-
-    /**
-     * Creates a new MissingLineInconsistency.
-     *
-     * @param box
-     *                           The box that is the source of the missing line.
-     * @param expectedLineTarget
-     *                           The box that is the target of the missing line.
-     */
-    public MissingLineInconsistency(B box, B expectedLineTarget) {
-        super(box, null);
-        this.expectedLineTarget = expectedLineTarget;
-    }
-
-    @Override
-    public <R, M> Inconsistency<R, M> map(Function<B, R> boxMapper, Function<E, M> entityMapper) {
-        return new MissingLineInconsistency<>(boxMapper.apply(this.getBox()), boxMapper.apply(this.getExpectedLineTarget()));
-    }
-
-    /**
-     * The box that is the target of the missing line.
-     *
-     * @return The box that is the target of the missing line.
-     */
-    public B getExpectedLineTarget() {
-        return this.expectedLineTarget;
-    }
-
-    @Override
-    public B getOtherBox() {
-        return this.getExpectedLineTarget();
-    }
-
-    @Override
-    public InconsistencyType getType() {
-        return InconsistencyType.MISSING_LINE;
-    }
-
-    @Override
-    public boolean equals(Object object) {
-        if (this == object)
-            return true;
-        if (object == null || this.getClass() != object.getClass())
-            return false;
-        if (!super.equals(object))
-            return false;
-        MissingLineInconsistency<?, ?> that = (MissingLineInconsistency<?, ?>) object;
-        return Objects.equals(this.getExpectedLineTarget(), that.getExpectedLineTarget());
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(super.hashCode(), this.getExpectedLineTarget());
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this).append("expectedLineTarget", this.expectedLineTarget).toString();
-    }
-}
diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/NameInconsistency.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/NameInconsistency.java
deleted file mode 100644
index 010987fb6..000000000
--- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/NameInconsistency.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/* Licensed under MIT 2023. */
-package edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common.inconsistencies;
-
-import java.util.Objects;
-import java.util.function.Function;
-
-/**
- * Indicates that the name of a box and the name of an entity are inconsistent.
- * 
- * @param <B> The type of the box.
- * @param <E> The type of the entity.
- */
-public class NameInconsistency<B, E> extends Inconsistency<B, E> {
-    private final String actualName;
-    private final String expectedName;
-
-    /**
-     * Creates a new NameInconsistency.
-     *
-     * @param box
-     *                     The box that is part of the inconsistency.
-     * @param entity
-     *                     The entity that is part of the inconsistency.
-     * @param expectedName
-     *                     The name that the entity has.
-     * @param actualName
-     *                     The name that the box has.
-     */
-    public NameInconsistency(B box, E entity, String expectedName, String actualName) {
-        super(box, entity);
-
-        if (box == null || entity == null) {
-            throw new IllegalArgumentException("Both box and entity must not be null.");
-        }
-
-        this.actualName = actualName;
-        this.expectedName = expectedName;
-    }
-
-    @Override
-    public <R, M> Inconsistency<R, M> map(Function<B, R> boxMapper, Function<E, M> entityMapper) {
-        return new NameInconsistency<>(boxMapper.apply(this.getBox()), entityMapper.apply(this.getEntity()), this.getExpectedName(), this.getActualName());
-    }
-
-    @Override
-    public String getActualName() {
-        return this.actualName;
-    }
-
-    @Override
-    public String getExpectedName() {
-        return this.expectedName;
-    }
-
-    @Override
-    public InconsistencyType getType() {
-        return InconsistencyType.NAME_INCONSISTENCY;
-    }
-
-    @Override
-    public String toString() {
-        return String.format("NameInconsistency[box=%s, entity=%s, actualName=%s, expectedName=%s]", this.getBox(), this.getEntity(), this.actualName,
-                this.expectedName);
-    }
-
-    @Override
-    public boolean equals(Object object) {
-        if (this == object)
-            return true;
-        if (object == null || this.getClass() != object.getClass())
-            return false;
-        if (!super.equals(object))
-            return false;
-        NameInconsistency<?, ?> that = (NameInconsistency<?, ?>) object;
-        return Objects.equals(this.getActualName(), that.getActualName()) && Objects.equals(this.getExpectedName(), that.getExpectedName());
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(super.hashCode(), this.getActualName(), this.getExpectedName());
-    }
-}
diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/UnexpectedBoxInconsistency.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/UnexpectedBoxInconsistency.java
deleted file mode 100644
index eb348df0d..000000000
--- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/UnexpectedBoxInconsistency.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Licensed under MIT 2023. */
-package edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common.inconsistencies;
-
-import java.util.function.Function;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-/**
- * Indicates that a box is unexpected in the diagram.
- * 
- * @param <B> The type of the box.
- * @param <E> The type of the entity.
- */
-public class UnexpectedBoxInconsistency<B, E> extends Inconsistency<B, E> {
-    /**
-     * Creates a new UnexpectedBoxInconsistency.
-     *
-     * @param box
-     *            The box that is unexpected.
-     */
-    public UnexpectedBoxInconsistency(B box) {
-        super(box, null);
-    }
-
-    @Override
-    public <R, M> Inconsistency<R, M> map(Function<B, R> boxMapper, Function<E, M> entityMapper) {
-        return new UnexpectedBoxInconsistency<>(boxMapper.apply(this.getBox()));
-    }
-
-    @Override
-    public InconsistencyType getType() {
-        return InconsistencyType.UNEXPECTED_BOX;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this).toString();
-    }
-}
diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/UnexpectedLineInconsistency.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/UnexpectedLineInconsistency.java
deleted file mode 100644
index 7388e43b3..000000000
--- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/UnexpectedLineInconsistency.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/* Licensed under MIT 2023. */
-package edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common.inconsistencies;
-
-import java.util.Objects;
-import java.util.function.Function;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-/**
- * Indicates that a box has an unexpected line.
- * 
- * @param <B> The type of the box.
- * @param <E> The type of the entity.
- */
-public class UnexpectedLineInconsistency<B, E> extends Inconsistency<B, E> {
-    private final B unexpectedLineTarget;
-
-    /**
-     * Creates a new UnexpectedLineInconsistency.
-     *
-     * @param box
-     *                             The box that is the source of the unexpected line.
-     * @param unexpectedLineTarget
-     *                             The box that is the target of the unexpected line.
-     */
-    public UnexpectedLineInconsistency(B box, B unexpectedLineTarget) {
-        super(box, null);
-        this.unexpectedLineTarget = Objects.requireNonNull(unexpectedLineTarget);
-    }
-
-    @Override
-    public <R, M> Inconsistency<R, M> map(Function<B, R> boxMapper, Function<E, M> entityMapper) {
-        return new UnexpectedLineInconsistency<>(boxMapper.apply(this.getBox()), boxMapper.apply(this.getUnexpectedLineTarget()));
-    }
-
-    /**
-     * The box that is the target of the missing line.
-     *
-     * @return The box that is the target of the missing line.
-     */
-    public B getUnexpectedLineTarget() {
-        return this.unexpectedLineTarget;
-    }
-
-    @Override
-    public B getOtherBox() {
-        return this.getUnexpectedLineTarget();
-    }
-
-    @Override
-    public InconsistencyType getType() {
-        return InconsistencyType.UNEXPECTED_LINE;
-    }
-
-    @Override
-    public boolean equals(Object object) {
-        if (this == object)
-            return true;
-        if (object == null || this.getClass() != object.getClass())
-            return false;
-        if (!super.equals(object))
-            return false;
-        UnexpectedLineInconsistency<?, ?> that = (UnexpectedLineInconsistency<?, ?>) object;
-        return Objects.equals(this.getUnexpectedLineTarget(), that.getUnexpectedLineTarget());
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(super.hashCode(), this.getUnexpectedLineTarget());
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this).append("unexpectedLineTarget", this.unexpectedLineTarget).toString();
-    }
-}
diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/refinement/Casing.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/refinement/Casing.java
deleted file mode 100644
index 58eb7627e..000000000
--- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/refinement/Casing.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/* Licensed under MIT 2023. */
-package edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common.inconsistencies.refinement;
-
-import java.util.ArrayList;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-import java.util.function.Function;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-import edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common.inconsistencies.Inconsistency;
-import edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common.inconsistencies.InconsistencyType;
-import edu.kit.kastel.mcse.ardoco.core.architecture.Deterministic;
-
-/**
- * Indicates that some box texts use different casing conventions that the model.
- *
- * @param <B>
- *            The type of the box.
- * @param <E>
- *            The type of the entity.
- */
-@Deterministic
-public class Casing<B, E> extends Inconsistency<B, E> {
-    private final List<B> boxes = new ArrayList<>();
-    private final List<String> expectedNames = new ArrayList<>();
-
-    protected Casing(List<B> boxes, List<String> expectedNames) {
-        super(null, null);
-        this.boxes.addAll(boxes);
-        this.expectedNames.addAll(expectedNames);
-    }
-
-    /**
-     * Discovers inconsistencies of this type in a set of basic inconsistencies.
-     *
-     * @param inconsistencies
-     *                        The list of inconsistencies, will be modified.
-     * @param <B>
-     *                        The type used to represent boxes.
-     * @param <E>
-     *                        The type used to represent entities.
-     * @return The list of inconsistencies, modified to include the newly discovered ones and without the ones that were
-     *         used to discover new ones.
-     */
-    public static <B, E> List<Inconsistency<B, E>> discover(List<Inconsistency<B, E>> inconsistencies) {
-        Set<Inconsistency<B, E>> newInconsistencies = new LinkedHashSet<>(inconsistencies);
-
-        List<B> boxes = new ArrayList<>();
-        List<String> expectedNames = new ArrayList<>();
-
-        var nameInconsistencies = getAllNameInconsistencies(newInconsistencies);
-        for (var nameInconsistency : nameInconsistencies) {
-            String actualName = Objects.requireNonNull(nameInconsistency.getActualName());
-            String expectedName = Objects.requireNonNull(nameInconsistency.getExpectedName());
-
-            if (actualName.equalsIgnoreCase(expectedName)) {
-                boxes.add(Objects.requireNonNull(nameInconsistency.getBox()));
-                expectedNames.add(expectedName);
-
-                newInconsistencies.remove(nameInconsistency);
-            }
-        }
-
-        if (boxes.size() > 1) {
-            newInconsistencies.add(new Casing<>(boxes, expectedNames));
-        }
-
-        return new ArrayList<>(newInconsistencies);
-    }
-
-    private static <B, E> List<Inconsistency<B, E>> getAllNameInconsistencies(Set<Inconsistency<B, E>> inconsistencies) {
-        return inconsistencies.stream().filter(inconsistency -> inconsistency.getType() == InconsistencyType.NAME_INCONSISTENCY).toList();
-    }
-
-    @Override
-    public B getOtherBox() {
-        return null;
-    }
-
-    @Override
-    public <R, M> Inconsistency<R, M> map(Function<B, R> boxMapper, Function<E, M> entityMapper) {
-        return new Casing<>(this.boxes.stream().map(boxMapper).toList(), this.expectedNames);
-    }
-
-    @Override
-    public InconsistencyType getType() {
-        return null;
-    }
-
-    @Override
-    public boolean equals(Object object) {
-        if (this == object)
-            return true;
-        if (object == null || this.getClass() != object.getClass())
-            return false;
-        if (!super.equals(object))
-            return false;
-        Casing<?, ?> casing = (Casing<?, ?>) object;
-        return Objects.equals(this.boxes, casing.boxes) && Objects.equals(this.expectedNames, casing.expectedNames);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(super.hashCode(), this.boxes, this.expectedNames);
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this).append("boxes", this.boxes).append("expectedNames", this.expectedNames).toString();
-    }
-}
diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/refinement/Group.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/refinement/Group.java
deleted file mode 100644
index 47578d57f..000000000
--- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/refinement/Group.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/* Licensed under MIT 2023. */
-package edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common.inconsistencies.refinement;
-
-import java.util.List;
-import java.util.Objects;
-import java.util.function.Function;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-import edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common.inconsistencies.Inconsistency;
-import edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common.inconsistencies.InconsistencyType;
-
-/**
- * A group of inconsistencies that all belong to the same box.
- *
- * @param <B>
- *            The type of the box.
- * @param <E>
- *            The type of the entity.
- */
-public class Group<B, E> extends Inconsistency<B, E> {
-    private final List<Inconsistency<B, E>> inconsistencies;
-
-    /**
-     * Creates a new Group.
-     *
-     * @param box
-     *                        The box.
-     * @param inconsistencies
-     *                        The inconsistencies.
-     */
-    public Group(B box, List<Inconsistency<B, E>> inconsistencies) {
-        super(box, null);
-        this.inconsistencies = inconsistencies;
-    }
-
-    @Override
-    public <R, M> Inconsistency<R, M> map(Function<B, R> boxMapper, Function<E, M> entityMapper) {
-        return new Group<>(boxMapper.apply(this.getBox()), this.inconsistencies.stream()
-                .map(inconsistency -> inconsistency.map(boxMapper, entityMapper))
-                .toList());
-    }
-
-    @Override
-    public InconsistencyType getType() {
-        return null;
-    }
-
-    @Override
-    public boolean equals(Object object) {
-        if (this == object)
-            return true;
-        if (object == null || this.getClass() != object.getClass())
-            return false;
-        if (!super.equals(object))
-            return false;
-        Group<?, ?> group = (Group<?, ?>) object;
-        return Objects.equals(this.inconsistencies, group.inconsistencies);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(super.hashCode(), this.inconsistencies);
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this).append("inconsistencies", this.inconsistencies).toString();
-    }
-}
diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/refinement/LineInversion.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/refinement/LineInversion.java
deleted file mode 100644
index 8ea29cb0a..000000000
--- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/refinement/LineInversion.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/* Licensed under MIT 2023. */
-package edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common.inconsistencies.refinement;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.function.Function;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-import edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common.inconsistencies.Inconsistency;
-import edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common.inconsistencies.InconsistencyType;
-import edu.kit.kastel.mcse.ardoco.core.architecture.Deterministic;
-
-/**
- * Indicates that the direction of a line is inverted.
- *
- * @param <B>
- *            The type of the box.
- * @param <E>
- *            The type of the entity.
- */
-@Deterministic
-public class LineInversion<B, E> extends Inconsistency<B, E> {
-    private final B expectedTarget;
-
-    protected LineInversion(B expectedSource, B expectedTarget) {
-        super(expectedSource, null);
-        this.expectedTarget = expectedTarget;
-    }
-
-    /**
-     * Discovers inconsistencies of this type in a set of basic inconsistencies.
-     *
-     * @param inconsistencies
-     *                        The list of inconsistencies, will be modified.
-     * @param <B>
-     *                        The type used to represent boxes.
-     * @param <E>
-     *                        The type used to represent entities.
-     * @return The list of inconsistencies, modified to include the newly discovered ones and without the ones that were
-     *         used to discover new ones.
-     */
-    public static <B, E> List<Inconsistency<B, E>> discover(List<Inconsistency<B, E>> inconsistencies) {
-        Set<Inconsistency<B, E>> newInconsistencies = new LinkedHashSet<>(inconsistencies);
-
-        Map<B, Set<Inconsistency<B, E>>> boxesWithUnexpectedLine = getAllBoxesWithUnexpectedLines(inconsistencies);
-
-        for (var inconsistency : inconsistencies) {
-            if (inconsistency.getType() == InconsistencyType.MISSING_LINE) {
-                var unexpectedLineInconsistencies = boxesWithUnexpectedLine.get(inconsistency.getOtherBox());
-                if (unexpectedLineInconsistencies != null) {
-                    for (var unexpectedLineInconsistency : unexpectedLineInconsistencies) {
-                        if (Objects.equals(unexpectedLineInconsistency.getOtherBox(), inconsistency.getBox())) {
-                            newInconsistencies.remove(unexpectedLineInconsistency);
-                            newInconsistencies.remove(inconsistency);
-                            newInconsistencies.add(new LineInversion<>(inconsistency.getBox(), unexpectedLineInconsistency.getBox()));
-                        }
-                    }
-                }
-            }
-        }
-
-        return new ArrayList<>(newInconsistencies);
-    }
-
-    private static <B, E> Map<B, Set<Inconsistency<B, E>>> getAllBoxesWithUnexpectedLines(List<Inconsistency<B, E>> inconsistencies) {
-        Map<B, Set<Inconsistency<B, E>>> boxesWithUnexpectedLine = new LinkedHashMap<>();
-        for (var inconsistency : inconsistencies) {
-            if (inconsistency.getType() == InconsistencyType.UNEXPECTED_LINE) {
-                boxesWithUnexpectedLine.computeIfAbsent(inconsistency.getBox(), k -> new LinkedHashSet<>()).add(inconsistency);
-            }
-        }
-        return boxesWithUnexpectedLine;
-    }
-
-    @Override
-    public B getOtherBox() {
-        return this.expectedTarget;
-    }
-
-    @Override
-    public <R, M> Inconsistency<R, M> map(Function<B, R> boxMapper, Function<E, M> entityMapper) {
-        return new LineInversion<>(boxMapper.apply(this.getBox()), boxMapper.apply(this.getOtherBox()));
-    }
-
-    @Override
-    public InconsistencyType getType() {
-        return null;
-    }
-
-    @Override
-    public boolean equals(Object object) {
-        if (this == object)
-            return true;
-        if (object == null || this.getClass() != object.getClass())
-            return false;
-        if (!super.equals(object))
-            return false;
-        LineInversion<?, ?> that = (LineInversion<?, ?>) object;
-        return Objects.equals(this.expectedTarget, that.expectedTarget);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(super.hashCode(), this.expectedTarget);
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this).append("expectedTarget", this.expectedTarget).toString();
-    }
-}
diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/refinement/NameExtension.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/refinement/NameExtension.java
deleted file mode 100644
index afda2ba72..000000000
--- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/refinement/NameExtension.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/* Licensed under MIT 2023. */
-package edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common.inconsistencies.refinement;
-
-import java.util.ArrayList;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-import java.util.function.Function;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-import edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common.inconsistencies.Inconsistency;
-import edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common.inconsistencies.InconsistencyType;
-import edu.kit.kastel.mcse.ardoco.core.architecture.Deterministic;
-
-/**
- * Indicates that the name of a box has been extended with unexpected text, e.g. a description.
- *
- * @param <B>
- *            The type of the box.
- * @param <E>
- *            The type of the entity.
- */
-@Deterministic
-public class NameExtension<B, E> extends Inconsistency<B, E> {
-    private final String expectedName;
-
-    protected NameExtension(B box, E entity, String expectedName) {
-        super(box, entity);
-        this.expectedName = expectedName;
-    }
-
-    /**
-     * Discovers inconsistencies of this type in a set of basic inconsistencies.
-     *
-     * @param inconsistencies
-     *                           The list of inconsistencies, will be modified.
-     * @param boxNameProvider
-     *                           A function that provides the name of a box.
-     * @param entityNameProvider
-     *                           A function that provides the name of an entity.
-     * @param <B>
-     *                           The type used to represent boxes.
-     * @param <E>
-     *                           The type used to represent entities.
-     * @return The list of inconsistencies, modified to include the newly discovered ones and without the ones that were
-     *         used to discover new ones.
-     */
-    public static <B, E> List<Inconsistency<B, E>> discover(List<Inconsistency<B, E>> inconsistencies, Function<B, String> boxNameProvider,
-            Function<E, String> entityNameProvider) {
-        Set<Inconsistency<B, E>> newInconsistencies = new LinkedHashSet<>(inconsistencies);
-
-        List<Inconsistency<B, E>> nameInconsistencies = getAllNameInconsistencies(newInconsistencies);
-        for (var nameInconsistency : nameInconsistencies) {
-            Objects.requireNonNull(nameInconsistency.getActualName());
-            Objects.requireNonNull(nameInconsistency.getExpectedName());
-
-            if (nameInconsistency.getActualName().contains(nameInconsistency.getExpectedName())) {
-                newInconsistencies.add(new NameExtension<>(nameInconsistency.getBox(), nameInconsistency.getEntity(), nameInconsistency.getExpectedName()));
-                newInconsistencies.remove(nameInconsistency);
-            }
-        }
-
-        List<Inconsistency<B, E>> missingBoxInconsistencies = getAllMissingBoxInconsistencies(newInconsistencies);
-        List<Inconsistency<B, E>> unexpectedBoxInconsistencies = getAllUnexpectedBoxInconsistencies(newInconsistencies);
-        for (var missingBoxInconsistency : missingBoxInconsistencies) {
-            for (var unexpectedBoxInconsistency : unexpectedBoxInconsistencies) {
-                Objects.requireNonNull(missingBoxInconsistency.getEntity());
-                Objects.requireNonNull(unexpectedBoxInconsistency.getBox());
-
-                String missingName = entityNameProvider.apply(missingBoxInconsistency.getEntity());
-                String unexpectedName = boxNameProvider.apply(unexpectedBoxInconsistency.getBox());
-
-                if (unexpectedName.contains(missingName)) {
-                    newInconsistencies.add(new NameExtension<>(unexpectedBoxInconsistency.getBox(), missingBoxInconsistency.getEntity(), missingName));
-                    newInconsistencies.remove(missingBoxInconsistency);
-                    newInconsistencies.remove(unexpectedBoxInconsistency);
-                }
-            }
-        }
-
-        return new ArrayList<>(newInconsistencies);
-    }
-
-    private static <B, E> List<Inconsistency<B, E>> getAllNameInconsistencies(Set<Inconsistency<B, E>> inconsistencies) {
-        return inconsistencies.stream().filter(inconsistency -> inconsistency.getType() == InconsistencyType.NAME_INCONSISTENCY).toList();
-    }
-
-    private static <B, E> List<Inconsistency<B, E>> getAllMissingBoxInconsistencies(Set<Inconsistency<B, E>> inconsistencies) {
-        return inconsistencies.stream().filter(inconsistency -> inconsistency.getType() == InconsistencyType.MISSING_BOX).toList();
-    }
-
-    private static <B, E> List<Inconsistency<B, E>> getAllUnexpectedBoxInconsistencies(Set<Inconsistency<B, E>> inconsistencies) {
-        return inconsistencies.stream().filter(inconsistency -> inconsistency.getType() == InconsistencyType.UNEXPECTED_BOX).toList();
-    }
-
-    @Override
-    public <R, M> Inconsistency<R, M> map(Function<B, R> boxMapper, Function<E, M> entityMapper) {
-        return new NameExtension<>(boxMapper.apply(this.getBox()), entityMapper.apply(this.getEntity()), this.expectedName);
-    }
-
-    @Override
-    public InconsistencyType getType() {
-        return null;
-    }
-
-    @Override
-    public boolean equals(Object object) {
-        if (this == object)
-            return true;
-        if (object == null || this.getClass() != object.getClass())
-            return false;
-        if (!super.equals(object))
-            return false;
-        NameExtension<?, ?> that = (NameExtension<?, ?>) object;
-        return Objects.equals(this.expectedName, that.expectedName);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(super.hashCode(), this.expectedName);
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this).append("expectedName", this.expectedName).toString();
-    }
-}
diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/refinement/Swap.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/refinement/Swap.java
deleted file mode 100644
index 42baf3ca0..000000000
--- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/refinement/Swap.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/* Licensed under MIT 2023. */
-package edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common.inconsistencies.refinement;
-
-import java.util.ArrayList;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-import java.util.function.Function;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.jgrapht.alg.util.UnorderedPair;
-
-import edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common.inconsistencies.Inconsistency;
-import edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common.inconsistencies.InconsistencyType;
-import edu.kit.kastel.mcse.ardoco.core.architecture.Deterministic;
-
-/**
- * Indicates that two boxes are (partially) swapped.
- *
- * @param <B>
- *            The type of the box.
- * @param <E>
- *            The type of the entity.
- */
-@Deterministic
-public class Swap<B, E> extends Inconsistency<B, E> {
-    private final B otherBox;
-    private final String otherExpectedName;
-
-    protected Swap(B box, E entity, B otherBox, String otherExpectedName) {
-        super(box, entity);
-        this.otherBox = otherBox;
-        this.otherExpectedName = otherExpectedName;
-    }
-
-    /**
-     * Discovers inconsistencies of this type in a set of basic inconsistencies.
-     *
-     * @param inconsistencies
-     *                        The list of inconsistencies, will be modified.
-     * @param <B>
-     *                        The type used to represent boxes.
-     * @param <E>
-     *                        The type used to represent entities.
-     * @return The list of inconsistencies, modified to include the newly discovered ones and without the ones that were
-     *         used to discover new ones.
-     */
-    public static <B, E> List<Inconsistency<B, E>> discover(List<Inconsistency<B, E>> inconsistencies) {
-        Set<Inconsistency<B, E>> newInconsistencies = new LinkedHashSet<>(inconsistencies);
-
-        Set<UnorderedPair<Inconsistency<B, E>, Inconsistency<B, E>>> done = new LinkedHashSet<>();
-
-        var nameInconsistencies = getAllNameInconsistencies(newInconsistencies);
-        for (var first : nameInconsistencies) {
-            for (var second : nameInconsistencies) {
-                if (first == second || done.contains(new UnorderedPair<>(first, second)))
-                    continue;
-                done.add(new UnorderedPair<>(first, second));
-
-                String firstExpectedName = Objects.requireNonNull(first.getExpectedName());
-                String secondActualName = Objects.requireNonNull(second.getActualName());
-                String secondExpectedName = Objects.requireNonNull(second.getExpectedName());
-
-                if (firstExpectedName.equals(secondActualName)) {
-                    newInconsistencies.add(new Swap<>(first.getBox(), first.getEntity(), second.getBox(), secondExpectedName));
-
-                    newInconsistencies.remove(first);
-                    newInconsistencies.remove(second);
-                }
-            }
-        }
-
-        return new ArrayList<>(newInconsistencies);
-    }
-
-    private static <B, E> List<Inconsistency<B, E>> getAllNameInconsistencies(Set<Inconsistency<B, E>> inconsistencies) {
-        return inconsistencies.stream().filter(inconsistency -> inconsistency.getType() == InconsistencyType.NAME_INCONSISTENCY).toList();
-    }
-
-    @Override
-    public B getOtherBox() {
-        return null;
-    }
-
-    @Override
-    public <R, M> Inconsistency<R, M> map(Function<B, R> boxMapper, Function<E, M> entityMapper) {
-        return new Swap<>(boxMapper.apply(this.getBox()), entityMapper.apply(this.getEntity()), boxMapper.apply(this.otherBox), this.otherExpectedName);
-    }
-
-    @Override
-    public InconsistencyType getType() {
-        return null;
-    }
-
-    @Override
-    public boolean equals(Object object) {
-        if (this == object)
-            return true;
-        if (object == null || this.getClass() != object.getClass())
-            return false;
-        if (!super.equals(object))
-            return false;
-        Swap<?, ?> casing = (Swap<?, ?>) object;
-        return Objects.equals(this.otherBox, casing.otherBox) && Objects.equals(this.otherExpectedName, casing.otherExpectedName);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(super.hashCode(), this.otherBox, this.otherExpectedName);
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this).append("otherBox", this.otherBox).append("otherExpectedName", this.otherExpectedName).toString();
-    }
-}
diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/rules/AllBoxesMustBeLinked.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/rules/AllBoxesMustBeLinked.java
deleted file mode 100644
index beffa1df4..000000000
--- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/rules/AllBoxesMustBeLinked.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Licensed under MIT 2023. */
-package edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common.inconsistencies.rules;
-
-import java.util.List;
-
-import edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common.inconsistencies.Inconsistency;
-import edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common.inconsistencies.UnexpectedBoxInconsistency;
-import edu.kit.kastel.mcse.ardoco.core.api.diagramrecognition.Box;
-import edu.kit.kastel.mcse.ardoco.core.api.models.Entity;
-
-/**
- * This rule requires that all boxes are part of a link.
- */
-public class AllBoxesMustBeLinked extends Rule {
-    @Override
-    public List<Inconsistency<Box, Entity>> check(Box box, Entity entity) {
-        if (box != null && entity == null) {
-            return List.of(new UnexpectedBoxInconsistency<>(box));
-        }
-
-        return List.of();
-    }
-}
diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/rules/AllModelEntitiesMustBeRepresented.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/rules/AllModelEntitiesMustBeRepresented.java
deleted file mode 100644
index 82b3c93fa..000000000
--- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/rules/AllModelEntitiesMustBeRepresented.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Licensed under MIT 2023. */
-package edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common.inconsistencies.rules;
-
-import java.util.List;
-
-import edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common.inconsistencies.Inconsistency;
-import edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common.inconsistencies.MissingBoxInconsistency;
-import edu.kit.kastel.mcse.ardoco.core.api.diagramrecognition.Box;
-import edu.kit.kastel.mcse.ardoco.core.api.models.Entity;
-
-/**
- * This rule requires that all entities of the model are represented in the diagram.
- */
-public class AllModelEntitiesMustBeRepresented extends Rule {
-
-    @Override
-    public List<Inconsistency<Box, Entity>> check(Box box, Entity entity) {
-        if (box == null && entity != null) {
-            return List.of(new MissingBoxInconsistency<>(entity));
-        }
-
-        return List.of();
-    }
-}
diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/rules/BoxesMustBeInParent.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/rules/BoxesMustBeInParent.java
deleted file mode 100644
index 082340efc..000000000
--- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/rules/BoxesMustBeInParent.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/* Licensed under MIT 2023. */
-package edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common.inconsistencies.rules;
-
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.SortedMap;
-
-import edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common.DiagramUtility;
-import edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common.Transformations;
-import edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common.inconsistencies.HierarchyInconsistency;
-import edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common.inconsistencies.Inconsistency;
-import edu.kit.kastel.mcse.ardoco.core.api.diagramrecognition.Box;
-import edu.kit.kastel.mcse.ardoco.core.api.models.Entity;
-import edu.kit.kastel.mcse.ardoco.core.architecture.Deterministic;
-
-/**
- * This rule requires that every box is contained in the box corresponding to its parent entity. If the parent is not
- * present in the diagram, this rule does not apply. Additionally, this rule checks that boxes do not have a parent box
- * that is not their parent entity.
- */
-@Deterministic
-public class BoxesMustBeInParent extends Rule {
-    private Map<Entity, Entity> entityToParent = null;
-    private Map<Box, Box> boxToParent = null;
-
-    @Override
-    public Runnable setup() {
-        this.entityToParent = new LinkedHashMap<>();
-        Transformations.transformAny(this.getModel(), entity -> entity, (dependent, dependency) -> {
-        }, (child, parent) -> this.entityToParent.put(child, parent));
-
-        this.boxToParent = new LinkedHashMap<>();
-        SortedMap<String, Box> boxes = DiagramUtility.getBoxes(this.getDiagram());
-        for (Box parent : this.getDiagram().getBoxes()) {
-            for (Box child : DiagramUtility.getContainedBoxes(parent, boxes)) {
-                this.boxToParent.put(child, parent);
-            }
-        }
-
-        return () -> {
-            this.entityToParent = null;
-            this.boxToParent = null;
-        };
-    }
-
-    @Override
-    public List<Inconsistency<Box, Entity>> check(Box box, Entity entity) {
-        if (box == null || entity == null) {
-            return List.of();
-        }
-
-        Box actualParentBox = this.boxToParent.get(box);
-        Entity actualParentEntity = null;
-        if (actualParentBox != null) {
-            actualParentEntity = this.getLinks().get(actualParentBox);
-        }
-
-        Entity expectedParentEntity = this.entityToParent.get(entity);
-        Box expectedParentBox = null;
-        if (expectedParentEntity != null) {
-            expectedParentBox = this.getLinks().inverse().get(expectedParentEntity);
-        }
-
-        if (Objects.equals(expectedParentBox, actualParentBox)) {
-            return List.of();
-        }
-
-        if (actualParentEntity == null) {
-            return List.of(); // Actual parent is not linked to model, might be correct parent if link would exist.
-        }
-
-        if (expectedParentBox == null && expectedParentEntity != null) {
-            return List.of(); // There is an entity that should be parent but is not found in the diagram.
-        }
-
-        return List.of(new HierarchyInconsistency<>(box, entity, expectedParentBox));
-    }
-}
diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/rules/EntitiesMustBeConnectedExactlyToDependencies.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/rules/EntitiesMustBeConnectedExactlyToDependencies.java
deleted file mode 100644
index ada2de7e9..000000000
--- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/rules/EntitiesMustBeConnectedExactlyToDependencies.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/* Licensed under MIT 2023. */
-package edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common.inconsistencies.rules;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedMap;
-
-import edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common.DiagramUtility;
-import edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common.Transformations;
-import edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common.inconsistencies.Inconsistency;
-import edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common.inconsistencies.MissingLineInconsistency;
-import edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common.inconsistencies.UnexpectedLineInconsistency;
-import edu.kit.kastel.mcse.ardoco.core.api.diagramrecognition.Box;
-import edu.kit.kastel.mcse.ardoco.core.api.diagramrecognition.Connector;
-import edu.kit.kastel.mcse.ardoco.core.api.models.Entity;
-import edu.kit.kastel.mcse.ardoco.core.architecture.Deterministic;
-
-/**
- * This rule requires that every box is connected to all its dependencies and no other boxes. Every provider of a
- * required interface is a dependency.
- */
-@Deterministic
-public class EntitiesMustBeConnectedExactlyToDependencies extends Rule {
-    private Map<Entity, Set<Entity>> entityToDependencies = null;
-
-    @Override
-    public Runnable setup() {
-        this.entityToDependencies = new LinkedHashMap<>();
-        Transformations.transformAny(this.getModel(), entity -> {
-            this.entityToDependencies.put(entity, new LinkedHashSet<>());
-            return entity;
-        }, (dependent, dependency) -> this.entityToDependencies.get(dependent).add(dependency), (child, parent) -> {
-        });
-
-        return () -> this.entityToDependencies = null;
-    }
-
-    @Override
-    public List<Inconsistency<Box, Entity>> check(Box box, Entity entity) {
-        if (box == null || entity == null) {
-            return List.of();
-        }
-
-        Set<Entity> dependencies = this.entityToDependencies.get(entity);
-        List<Inconsistency<Box, Entity>> inconsistencies = new ArrayList<>();
-
-        for (Entity dependency : dependencies) {
-            Box dependencyBox = this.getLinks().inverse().get(dependency);
-            if (dependencyBox != null && !DiagramUtility.hasConnectionBetween(this.getDiagram(), box, dependencyBox)) {
-                inconsistencies.add(new MissingLineInconsistency<>(box, dependencyBox));
-            }
-        }
-
-        SortedMap<String, Box> boxes = DiagramUtility.getBoxes(this.getDiagram());
-        for (Connector connector : DiagramUtility.getOutgoingConnectors(getDiagram(), box)) {
-            for (Box target : DiagramUtility.getTargets(connector, boxes)) {
-                Entity targetEntity = this.getLinks().get(target);
-                if (targetEntity != null && !dependencies.contains(targetEntity)) {
-                    inconsistencies.add(new UnexpectedLineInconsistency<>(box, target));
-                }
-            }
-        }
-
-        return inconsistencies;
-    }
-}
diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/rules/PackagesMustContainAllSubpackagesIfOneIsEmpty.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/rules/PackagesMustContainAllSubpackagesIfOneIsEmpty.java
deleted file mode 100644
index 1258837fa..000000000
--- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/rules/PackagesMustContainAllSubpackagesIfOneIsEmpty.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/* Licensed under MIT 2023. */
-package edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common.inconsistencies.rules;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedMap;
-
-import edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common.DiagramUtility;
-import edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common.Transformations;
-import edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common.inconsistencies.Inconsistency;
-import edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common.inconsistencies.MissingBoxInconsistency;
-import edu.kit.kastel.mcse.ardoco.core.api.diagramrecognition.Box;
-import edu.kit.kastel.mcse.ardoco.core.api.models.Entity;
-import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.code.CodePackage;
-import edu.kit.kastel.mcse.ardoco.core.architecture.Deterministic;
-
-/**
- * This rule requires that a box that represents a package contains all its subpackages if one of the subpackages is
- * displayed without content despite having content in the model.
- */
-@Deterministic
-public class PackagesMustContainAllSubpackagesIfOneIsEmpty extends Rule {
-    private Map<Entity, Set<Entity>> packageToSubpackages = null;
-    private SortedMap<String, Box> boxes = null;
-
-    @Override
-    public Runnable setup() {
-        this.packageToSubpackages = new LinkedHashMap<>();
-        Transformations.transformAny(this.getModel(), entity -> {
-            if (entity instanceof CodePackage codePackage) {
-                this.packageToSubpackages.put(codePackage, new LinkedHashSet<>());
-            }
-            return entity;
-        }, (dependent, dependency) -> {
-        }, (child, parent) -> {
-            if (child instanceof CodePackage childPackage && parent instanceof CodePackage parentPackage) {
-                this.packageToSubpackages.get(parentPackage).add(childPackage);
-            }
-        });
-
-        this.boxes = DiagramUtility.getBoxes(this.getDiagram());
-
-        return () -> {
-            this.packageToSubpackages = null;
-            this.boxes = null;
-        };
-    }
-
-    @Override
-    public List<Inconsistency<Box, Entity>> check(Box box, Entity entity) {
-        if (box == null || entity == null) {
-            return List.of();
-        }
-
-        Set<Entity> childEntities = this.packageToSubpackages.get(entity);
-
-        if (childEntities == null || childEntities.isEmpty()) {
-            return List.of();
-        }
-
-        List<Box> childBoxes = DiagramUtility.getContainedBoxes(box, this.boxes);
-        boolean isDisplaying = childBoxes.stream().anyMatch(this::isDisplaying);
-
-        if (!isDisplaying) {
-            return List.of();
-        }
-
-        List<Inconsistency<Box, Entity>> inconsistencies = new ArrayList<>();
-        for (Entity childEntity : childEntities) {
-            Box childBox = this.getLinks().inverse().get(childEntity);
-            if (childBox == null) {
-                inconsistencies.add(new MissingBoxInconsistency<>(childEntity));
-            }
-        }
-        return inconsistencies;
-    }
-
-    private boolean isDisplaying(Box box) {
-        Entity entity = this.getLinks().get(box);
-        if (entity == null) {
-            return false;
-        }
-        if (!this.packageToSubpackages.containsKey(entity)) {
-            return false;
-        }
-        return box.getContainedBoxes().isEmpty();
-    }
-}
diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/rules/Rule.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/rules/Rule.java
deleted file mode 100644
index 0866d70e8..000000000
--- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/rules/Rule.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/* Licensed under MIT 2023. */
-package edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common.inconsistencies.rules;
-
-import java.util.List;
-
-import org.eclipse.collections.api.bimap.MutableBiMap;
-
-import edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common.inconsistencies.Inconsistency;
-import edu.kit.kastel.mcse.ardoco.core.api.diagramrecognition.Box;
-import edu.kit.kastel.mcse.ardoco.core.api.diagramrecognition.Diagram;
-import edu.kit.kastel.mcse.ardoco.core.api.models.Entity;
-import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.Model;
-
-/**
- * Base class for all rules. A rule defines a condition that must be met for diagram and model elements to be considered
- * consistent.
- */
-public abstract class Rule {
-    private Diagram diagram;
-    private Model model;
-    private MutableBiMap<Box, Entity> links;
-    private Runnable tearDown;
-
-    /**
-     * Sets the rule up for a given diagram and model and the links between them.
-     *
-     * @param diagram
-     *                The diagram.
-     * @param model
-     *                The model.
-     * @param links
-     *                All found trace links between boxes and entities.
-     */
-    public final void setup(Diagram diagram, Model model, MutableBiMap<Box, Entity> links) {
-        this.diagram = diagram;
-        this.model = model;
-        this.links = links;
-        this.tearDown = this.setup();
-    }
-
-    /**
-     * Cleans up the rule after it has been run.
-     */
-    public final void tearDown() {
-        this.model = null;
-        this.diagram = null;
-        this.links = null;
-        this.tearDown.run();
-    }
-
-    /**
-     * Checks the consistency for a given box or entity. If a box or entity is part of a link, both should be passed to
-     * the rule. For boxes and entities that are not part of a link, the other parameter should be null.
-     *
-     * @param box
-     *               The box to check, or null if just the entity should be checked.
-     * @param entity
-     *               The entity to check, or null if just the box should be checked.
-     * @return A list of inconsistencies, or an empty list if there are no inconsistencies.
-     */
-    public abstract List<Inconsistency<Box, Entity>> check(Box box, Entity entity);
-
-    /**
-     * This can be overridden to create data used in the check method.
-     *
-     * @return A runnable that contains all teardown actions.
-     */
-    protected Runnable setup() {
-        return () -> {
-        };
-    }
-
-    protected final Diagram getDiagram() {
-        return this.diagram;
-    }
-
-    protected final Model getModel() {
-        return this.model;
-    }
-
-    protected final MutableBiMap<Box, Entity> getLinks() {
-        return this.links;
-    }
-}
diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/rules/SameNameForLinkedElements.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/rules/SameNameForLinkedElements.java
deleted file mode 100644
index bb7587c6b..000000000
--- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/inconsistencies/rules/SameNameForLinkedElements.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Licensed under MIT 2023. */
-package edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common.inconsistencies.rules;
-
-import java.util.List;
-
-import edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common.DiagramUtility;
-import edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common.inconsistencies.Inconsistency;
-import edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common.inconsistencies.NameInconsistency;
-import edu.kit.kastel.mcse.ardoco.core.api.diagramrecognition.Box;
-import edu.kit.kastel.mcse.ardoco.core.api.models.Entity;
-
-/**
- * This rule requires that linked elements have the same name.
- */
-public class SameNameForLinkedElements extends Rule {
-    @Override
-    public List<Inconsistency<Box, Entity>> check(Box box, Entity entity) {
-        if (box == null || entity == null) {
-            return List.of();
-        }
-
-        if (DiagramUtility.getBoxText(box).equals(entity.getName())) {
-            return List.of();
-        }
-
-        return List.of(new NameInconsistency<>(box, entity, entity.getName(), DiagramUtility.getBoxText(box)));
-    }
-}
diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/similarityflooding/FixpointFormula.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/similarityflooding/FixpointFormula.java
deleted file mode 100644
index 1ebb152a4..000000000
--- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/similarityflooding/FixpointFormula.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/* Licensed under MIT 2023. */
-package edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common.similarityflooding;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.function.UnaryOperator;
-
-/**
- * The formula for the fixpoint computation.
- * The four formulas defined here are described first in: S. Melnik, H. Garcia-Molina, and E. Rahm, ‘Similarity
- * flooding: a versatile graph matching algorithm and its application to schema matching’, in Proceedings 18th
- * International Conference on Data Engineering, Feb. 2002, pp. 117–128. doi: 10.1109/ICDE.2002.994702.
- */
-public interface FixpointFormula {
-    /**
-     * Add the three given mappings together.
-     *
-     * @param first  The first mapping.
-     * @param second The second mapping.
-     * @param third  The third mapping.
-     * @return The sum of the mappings.
-     */
-    static List<Double> add(List<Double> first, List<Double> second, List<Double> third) {
-        return add(add(first, second), third);
-    }
-
-    /**
-     * Add the two given mappings together.
-     *
-     * @param first
-     *               The first mapping.
-     * @param second
-     *               The second mapping.
-     * @return The sum of the mappings.
-     */
-    static List<Double> add(List<Double> first, List<Double> second) {
-        if (first.size() != second.size()) {
-            throw new IllegalArgumentException("The given mappings must have the same size.");
-        }
-
-        List<Double> result = new ArrayList<>(first.size());
-        for (int i = 0; i < first.size(); i++) {
-            result.add(first.get(i) + second.get(i));
-        }
-
-        return result;
-    }
-
-    /**
-     * Normalize the given mapping.
-     *
-     * @param mapping
-     *                The mapping to normalize.
-     * @return The normalized mapping.
-     */
-    static List<Double> normalize(List<Double> mapping) {
-        double max = mapping.stream().mapToDouble(Double::doubleValue).max().orElse(0.0);
-
-        if (max == 0) {
-            return mapping;
-        }
-
-        return mapping.stream().map(value -> value / max).toList();
-    }
-
-    /**
-     * Get the basic formula. {@code sigma[i+1] = normalize(sigma[i] + flood(sigma[i]))}
-     * This formula is used for the basic examples in the original paper but is not the recommended formula.
-     * Consider using {@link #getCFormula()} instead.
-     *
-     * @return The basic formula.
-     */
-    static FixpointFormula getBasicFormula() {
-        return (initialMapping, previousMapping, flood) -> FixpointFormula.normalize(FixpointFormula.add(previousMapping, flood.apply(previousMapping)));
-    }
-
-    /**
-     * Get the A formula. {@code sigma[i+1] = normalize(sigma[0] + flood(sigma[i]))}
-     * This formula is named "A" in the original paper.
-     *
-     * @return The basic formula.
-     */
-    static FixpointFormula getAFormula() {
-        return (initialMapping, previousMapping, flood) -> FixpointFormula.normalize(FixpointFormula.add(initialMapping, flood.apply(previousMapping)));
-    }
-
-    /**
-     * Get the B formula. {@code sigma[i+1] = normalize(sigma[0] + sigma[i] + flood(sigma[i]))}
-     * This formula is named "B" in the original paper.
-     *
-     * @return The basic formula.
-     */
-    static FixpointFormula getBFormula() {
-        return (initialMapping, previousMapping, flood) -> FixpointFormula.normalize(flood.apply(FixpointFormula.add(initialMapping, previousMapping)));
-    }
-
-    /**
-     * Get the C formula. {@code sigma[i+1] = normalize(sigma[0] + sigma[i] + flood(sigma[0] + sigma[i]))}
-     * This formula is named "C" in the original paper, and is the recommended formula.
-     *
-     * @return The basic formula.
-     */
-    static FixpointFormula getCFormula() {
-        return (initialMapping, previousMapping, flood) -> FixpointFormula.normalize(FixpointFormula.add(initialMapping, previousMapping, flood.apply(
-                FixpointFormula.add(initialMapping, previousMapping))));
-    }
-
-    /**
-     * Calculate the next mapping based on the previous mapping.
-     *
-     * @param initialMapping
-     *                        The initial mapping.
-     * @param previousMapping
-     *                        The previous mapping.
-     * @param flood
-     *                        The flooding function.
-     * @return The next mapping.
-     */
-    List<Double> calculate(List<Double> initialMapping, List<Double> previousMapping, UnaryOperator<List<Double>> flood);
-}
diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/similarityflooding/LabeledEdge.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/similarityflooding/LabeledEdge.java
deleted file mode 100644
index 3007ce654..000000000
--- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/similarityflooding/LabeledEdge.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Licensed under MIT 2023. */
-package edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common.similarityflooding;
-
-/**
- * Describes a labeled edge.
- *
- * @param <L>
- *            The edge label type.
- */
-public interface LabeledEdge<L> {
-    /**
-     * Gets the label of the edge.
-     *
-     * @return The label.
-     */
-    L getLabel();
-}
diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/similarityflooding/MatchingFilter.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/similarityflooding/MatchingFilter.java
deleted file mode 100644
index 26ae93fec..000000000
--- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/similarityflooding/MatchingFilter.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Licensed under MIT 2023. */
-package edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common.similarityflooding;
-
-import org.eclipse.collections.api.bimap.MutableBiMap;
-
-/**
- * Filters all pairs in a mapping to only contain each element once.
- *
- * @param <A>
- *            The type of the first element of the mapping.
- * @param <B>
- *            The type of the second element of the mapping.
- */
-public interface MatchingFilter<A, B> {
-    /**
-     * Filters all pairs in a mapping to only contain each element once.
-     *
-     * @param finalMapping
-     *                       Result of the similarity flooding algorithm, which will be filtered.
-     * @param initialMapping
-     *                       The initial mapping which can optionally be provided to support the filtering.
-     * @return A set of pairs where each element is only part of at most one pair, represented by a bi-map.
-     */
-    MutableBiMap<A, B> filter(SimilarityMapping<A, B> finalMapping, SimilarityMapping<A, B> initialMapping);
-}
diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/similarityflooding/OrderedMatchingFilter.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/similarityflooding/OrderedMatchingFilter.java
deleted file mode 100644
index 833974899..000000000
--- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/similarityflooding/OrderedMatchingFilter.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/* Licensed under MIT 2023. */
-package edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common.similarityflooding;
-
-import java.util.ArrayList;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.collections.api.bimap.MutableBiMap;
-import org.eclipse.collections.impl.bimap.mutable.HashBiMap;
-import org.jgrapht.alg.util.Pair;
-
-import edu.kit.kastel.mcse.ardoco.core.architecture.Deterministic;
-
-/**
- * This matching filters orders all pairs by their similarity and assign the pairs with the highest similarity first.
- *
- * @param <A>
- *            The type of the first element in the pairs.
- * @param <B>
- *            The type of the second element in the pairs.
- */
-@Deterministic
-public class OrderedMatchingFilter<A, B> implements MatchingFilter<A, B> {
-    private final double minSimilarity;
-    private final double initialSimilarityThreshold;
-
-    /**
-     * Creates a new OrderedMatchingFilter.
-     *
-     * @param minSimilarity
-     *                                   The minimum similarity a pair must have to be included in the result.
-     * @param initialSimilarityThreshold
-     *                                   The minimum similarity two pairs must have to be considered equal in the initial mapping.
-     */
-    public OrderedMatchingFilter(double minSimilarity, double initialSimilarityThreshold) {
-        this.minSimilarity = minSimilarity;
-        this.initialSimilarityThreshold = initialSimilarityThreshold;
-    }
-
-    /**
-     * Creates a new OrderedMatchingFilter. No pairs are rejected because of their similarity.
-     */
-    public OrderedMatchingFilter() {
-        this(Double.NEGATIVE_INFINITY, Double.NEGATIVE_INFINITY);
-    }
-
-    private static <A, B> void selectBestMappings(List<Assignment<A, B>> sortedAssignments, Set<A> usedElementsInA, Set<B> usedElementsInB,
-            MutableBiMap<A, B> filteredPairs) {
-        for (Assignment<A, B> assignment : sortedAssignments) {
-            if (!usedElementsInA.contains(assignment.pair().getFirst()) && !usedElementsInB.contains(assignment.pair().getSecond())) {
-                filteredPairs.put(assignment.pair().getFirst(), assignment.pair().getSecond());
-                usedElementsInA.add(assignment.pair().getFirst());
-                usedElementsInB.add(assignment.pair().getSecond());
-            }
-        }
-    }
-
-    @Override
-    public MutableBiMap<A, B> filter(SimilarityMapping<A, B> finalMapping, SimilarityMapping<A, B> initialMapping) {
-        Set<A> usedElementsInA = new LinkedHashSet<>();
-        Set<B> usedElementsInB = new LinkedHashSet<>();
-        MutableBiMap<A, B> filteredPairs = new HashBiMap<>();
-
-        List<Assignment<A, B>> sortedAssignments = initialMapping == null ? this.sortMappings(finalMapping) : this.sortMappings(finalMapping, initialMapping);
-        selectBestMappings(sortedAssignments, usedElementsInA, usedElementsInB, filteredPairs);
-
-        return filteredPairs;
-    }
-
-    private List<Assignment<A, B>> sortMappings(SimilarityMapping<A, B> finalMapping) {
-        return finalMapping.getMappedElements()
-                .stream()
-                .map(pair -> new Assignment<>(pair, finalMapping.getSimilarity(pair)))
-                .sorted((left, right) -> Double.compare(right.similarity(), left.similarity()))
-                .takeWhile(assignment -> assignment.similarity() >= this.minSimilarity)
-                .toList();
-    }
-
-    private List<Assignment<A, B>> sortMappings(SimilarityMapping<A, B> finalMapping, SimilarityMapping<A, B> initialMapping) {
-        Set<Pair<A, B>> allPairs = initialMapping.getMappedElements();
-        Set<Pair<A, B>> mappedPairs = finalMapping.getMappedElements();
-
-        List<Assignment<A, B>> assignments = new ArrayList<>();
-
-        for (Pair<A, B> pair : allPairs) {
-            if (mappedPairs.contains(pair)) {
-                double similarity = finalMapping.getSimilarity(pair);
-                if (similarity >= this.minSimilarity) {
-                    // Offset by 1 to ensure that the final mapping is always preferred over the initial mapping.
-                    // This works because the similarity is always in the range [0, 1].
-                    assignments.add(new Assignment<>(pair, similarity + 1));
-                }
-            }
-
-            double similarity = initialMapping.getSimilarity(pair);
-            if (similarity >= this.initialSimilarityThreshold) {
-                assignments.add(new Assignment<>(pair, similarity));
-            }
-        }
-
-        assignments.sort((left, right) -> Double.compare(right.similarity(), left.similarity()));
-        return assignments;
-    }
-
-    private record Assignment<A, B>(Pair<A, B> pair, double similarity) {
-    }
-}
diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/similarityflooding/PropagationCoefficientFormula.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/similarityflooding/PropagationCoefficientFormula.java
deleted file mode 100644
index c717c7623..000000000
--- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/similarityflooding/PropagationCoefficientFormula.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/* Licensed under MIT 2023. */
-package edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common.similarityflooding;
-
-import java.util.Set;
-
-import org.jgrapht.alg.util.Pair;
-
-import edu.kit.kastel.mcse.ardoco.core.architecture.Deterministic;
-
-/**
- * Describes how to compute the propagation coefficient for a vertex.
- * The formulas do not use the order of the vertices, which ensures that even with non-deterministic orderings the result
- * is the deterministic.
- *
- * @param <A>
- *            The type of the vertices in the first graph.
- * @param <B>
- *            The type of the vertices in the second graph.
- */
-@FunctionalInterface
-@Deterministic
-public interface PropagationCoefficientFormula<A, B> {
-    /**
-     * Calculate the inverse average.
-     *
-     * @param <A>
-     *            The type of the vertices in the first graph.
-     * @param <B>
-     *            The type of the vertices in the second graph.
-     * @return The inverse average formula.
-     */
-    static <A, B> PropagationCoefficientFormula<A, B> getInverseAverageFormula() {
-        return vertices -> 2.0 / (vertices.getFirst().size() + vertices.getSecond().size());
-    }
-
-    /**
-     * Calculate the inverse product.
-     *
-     * @param <A>
-     *            The type of the vertices in the first graph.
-     * @param <B>
-     *            The type of the vertices in the second graph.
-     * @return The inverse average formula.
-     */
-    static <A, B> PropagationCoefficientFormula<A, B> getInverseProductFormula() {
-        return vertices -> {
-            if (vertices.getFirst().isEmpty() || vertices.getSecond().isEmpty()) {
-                return 0.0;
-            }
-
-            return 1.0 / (vertices.getFirst().size() * vertices.getSecond().size());
-        };
-    }
-
-    /**
-     * Calculates the propagation coefficient for a vertex and a specific label and edge category (in/out).
-     *
-     * @param vertices
-     *                 The neighboring vertices along an edge with a specific label and edge category.
-     * @return The propagation coefficient.
-     */
-    double calculate(Pair<Set<A>, Set<B>> vertices);
-}
diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/similarityflooding/SimilarityFloodingAlgorithm.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/similarityflooding/SimilarityFloodingAlgorithm.java
deleted file mode 100644
index 3907a3ee7..000000000
--- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/similarityflooding/SimilarityFloodingAlgorithm.java
+++ /dev/null
@@ -1,281 +0,0 @@
-/* Licensed under MIT 2023. */
-package edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common.similarityflooding;
-
-import java.util.AbstractMap;
-import java.util.ArrayList;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.function.BiFunction;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
-import org.eclipse.collections.impl.factory.Sets;
-import org.jgrapht.Graph;
-import org.jgrapht.alg.util.Pair;
-import org.jgrapht.graph.DefaultWeightedEdge;
-import org.jgrapht.graph.DirectedMultigraph;
-import org.jgrapht.graph.DirectedWeightedMultigraph;
-
-import edu.kit.kastel.mcse.ardoco.core.architecture.Deterministic;
-
-/**
- * Similarity flooding is a graph matching algorithm presented in: S. Melnik, H. Garcia-Molina, and E. Rahm, ‘Similarity
- * flooding: a versatile graph matching algorithm and its application to schema matching’, in Proceedings 18th
- * International Conference on Data Engineering, Feb. 2002, pp. 117–128. doi: 10.1109/ICDE.2002.994702.
- *
- * @param <A>
- *            The type of the vertices of the first graph.
- * @param <B>
- *            The type of the vertices of the second graph.
- * @param <L>
- *            The edge label type.
- */
-@Deterministic
-public class SimilarityFloodingAlgorithm<A, B, L> {
-    private final double epsilon;
-    private final int maxIterations;
-    private final PropagationCoefficientFormula<A, B> propagationCoefficientFormula;
-    private final FixpointFormula fixpointFormula;
-
-    /**
-     * Create a new instance of the SimilarityFloodingAlgorithm.
-     *
-     * @param epsilon
-     *                                      The threshold at which the algorithm stops.
-     * @param maxIterations
-     *                                      The maximum number of iterations the algorithm should perform, even if the threshold is not reached.
-     * @param propagationCoefficientFormula
-     *                                      The equation used to calculate the propagation coefficient.
-     * @param fixpointFormula
-     *                                      The equation used to calculate the next iteration's similarity mapping.
-     */
-    public SimilarityFloodingAlgorithm(double epsilon, int maxIterations, PropagationCoefficientFormula<A, B> propagationCoefficientFormula,
-            FixpointFormula fixpointFormula) {
-        if (maxIterations < 0) {
-            throw new IllegalArgumentException("maxIterations cannot be negative");
-        }
-
-        this.epsilon = epsilon;
-        this.maxIterations = maxIterations;
-        this.propagationCoefficientFormula = propagationCoefficientFormula;
-        this.fixpointFormula = fixpointFormula;
-    }
-
-    /**
-     * Match two graphs a and b, searching for similar vertices.
-     * This executes the similarity flooding algorithm.
-     *
-     * @param a
-     *                                The first graph.
-     * @param b
-     *                                The second graph.
-     * @param initialSimilarityValues
-     *                                The initial similarities of the vertices.
-     * @param <E>
-     *                                The actual edge type, proving the label of type {@link L}.
-     * @return The mapping between the vertices of the two graphs.
-     */
-    public <E extends LabeledEdge<L>> SimilarityMapping<A, B> match(DirectedMultigraph<A, E> a, DirectedMultigraph<B, E> b,
-            SimilarityMapping<A, B> initialSimilarityValues) {
-        DirectedWeightedMultigraph<Pair<A, B>, Edge> basePropagationGraph = this.buildPropagationGraph(a, b);
-
-        List<Pair<A, B>> vertices = new ArrayList<>(basePropagationGraph.vertexSet());
-        DirectedWeightedMultigraph<Integer, Edge> workingPropagationGraph = this.changeVertexType(vertices, basePropagationGraph);
-
-        // The SimilarityMapping can be represented by the function (a, b) -> double.
-        // To reduce overhead of searching in maps, list are used instead.
-        // The list provides the operation int -> double.
-        // The method changeVertexType determines the mapping (a, b) -> int.
-        // With these two new mappings, the same functionality is achieved.
-
-        List<Double> initialMapping = initialSimilarityValues.getMappedValues(vertices);
-        List<Double> previousMapping = initialMapping;
-        List<Double> nextMapping = initialMapping;
-
-        double delta = Double.POSITIVE_INFINITY;
-        for (int iteration = 0; iteration < this.maxIterations && delta > this.epsilon; iteration++) {
-            nextMapping = this.fixpointFormula.calculate(initialMapping, previousMapping, mapping -> this.floodSimilarities(workingPropagationGraph, mapping));
-            delta = this.residuum(previousMapping, nextMapping);
-
-            previousMapping = nextMapping;
-        }
-
-        return new SimilarityMapping<>(vertices, nextMapping);
-    }
-
-    private <V, E extends LabeledEdge<L>> Map<L, Set<V>> getInNeighbors(DirectedMultigraph<V, E> graph, V vertex) {
-        return graph.incomingEdgesOf(vertex)
-                .stream()
-                .collect(Collectors.groupingBy(LabeledEdge::getLabel, Collectors.mapping(graph::getEdgeSource, Collectors.toCollection(LinkedHashSet::new))));
-    }
-
-    private <V, E extends LabeledEdge<L>> Map<L, Set<V>> getOutNeighbors(DirectedMultigraph<V, E> graph, V vertex) {
-        return graph.outgoingEdgesOf(vertex)
-                .stream()
-                .collect(Collectors.groupingBy(LabeledEdge::getLabel, Collectors.mapping(graph::getEdgeTarget, Collectors.toCollection(LinkedHashSet::new))));
-    }
-
-    private <E extends LabeledEdge<L>> Map<L, Pair<Set<A>, Set<B>>> getPairwiseNeighbors(DirectedMultigraph<A, E> a, DirectedMultigraph<B, E> b,
-            BiFunction<DirectedMultigraph<A, E>, A, Map<L, Set<A>>> neighborInAProvider,
-            BiFunction<DirectedMultigraph<B, E>, B, Map<L, Set<B>>> neighborInBProvider, Pair<A, B> vertex) {
-        Map<L, Set<A>> neighborsInGraphA = neighborInAProvider.apply(a, vertex.getFirst());
-        Map<L, Set<B>> neighborsInGraphB = neighborInBProvider.apply(b, vertex.getSecond());
-
-        return Sets.union(neighborsInGraphA.keySet(), neighborsInGraphB.keySet())
-                .toMap(label -> label, label -> Pair.of(neighborsInGraphA.getOrDefault(label, Set.of()), neighborsInGraphB.getOrDefault(label, Set.of())));
-    }
-
-    private <E extends LabeledEdge<L>> Map<L, Pair<Set<A>, Set<B>>> getInNeighbors(DirectedMultigraph<A, E> a, DirectedMultigraph<B, E> b, Pair<A, B> vertex) {
-        return this.getPairwiseNeighbors(a, b, this::getInNeighbors, this::getInNeighbors, vertex);
-    }
-
-    private <E extends LabeledEdge<L>> Map<L, Pair<Set<A>, Set<B>>> getOutNeighbors(DirectedMultigraph<A, E> a, DirectedMultigraph<B, E> b, Pair<A, B> vertex) {
-        return this.getPairwiseNeighbors(a, b, this::getOutNeighbors, this::getOutNeighbors, vertex);
-    }
-
-    /**
-     * Calculate the propagation coefficients for each label. If the coefficient is 0.0, the label is filtered out. This
-     * is deterministic as the order of the labels is not used by the formula.
-     */
-    private Map<L, Double> calculateFilteredCoefficients(Map<L, Pair<Set<A>, Set<B>>> verticesByLabel) {
-        return verticesByLabel.entrySet()
-                .stream()
-                .map(entry -> new AbstractMap.SimpleEntry<>(entry.getKey(), this.propagationCoefficientFormula.calculate(entry.getValue())))
-                .filter(entry -> entry.getValue() > 0.0)
-                .collect(Collectors.toMap(AbstractMap.SimpleEntry::getKey, AbstractMap.SimpleEntry::getValue));
-    }
-
-    /**
-     * Add edges to all neighbors given by the cartesian product of components in 'neighbors'.
-     */
-    private void addEdgesToNeighbors(Graph<Pair<A, B>, Edge> graph, Pair<A, B> vertex, Pair<Set<A>, Set<B>> neighbors, double coefficient) {
-        var combinedNeighbors = Sets.cartesianProduct(neighbors.getFirst(), neighbors.getSecond(), Pair::new);
-        for (Pair<A, B> neighbor : combinedNeighbors) {
-            graph.addVertex(neighbor);
-
-            Edge edge = graph.addEdge(vertex, neighbor);
-            graph.setEdgeWeight(edge, coefficient);
-        }
-    }
-
-    /**
-     * For a given vertex, add edges to all neighbors given by the cartesian product of components in 'neighborsByLabel'.
-     * The edge weights are determined by 'coefficientsByLabel'.
-     */
-    private void addEdgesToAllNeighbors(Graph<Pair<A, B>, Edge> graph, Pair<A, B> vertex, Map<L, Pair<Set<A>, Set<B>>> neighborsByLabel,
-            Map<L, Double> coefficientsByLabel) {
-        for (var entry : coefficientsByLabel.entrySet()) {
-            Pair<Set<A>, Set<B>> currentNeighborGroup = neighborsByLabel.get(entry.getKey());
-            this.addEdgesToNeighbors(graph, vertex, currentNeighborGroup, entry.getValue());
-        }
-    }
-
-    /**
-     * Build the propagation graph from the two given graphs.
-     * The propagation graph uses the cartesian product of the vertices of the two graphs as vertices.
-     * The edges are weighted according to the propagation coefficient formula.
-     * If an edge as weight 0.0, it is not added to the graph.
-     * If a vertex has no incoming or outgoing edges, it is not added to the graph.
-     */
-    private <E extends LabeledEdge<L>> DirectedWeightedMultigraph<Pair<A, B>, Edge> buildPropagationGraph(DirectedMultigraph<A, E> a,
-            DirectedMultigraph<B, E> b) {
-        DirectedWeightedMultigraph<Pair<A, B>, Edge> propagation = new DirectedWeightedMultigraph<>(null, Edge::new);
-
-        Set<Pair<A, B>> possibleVertices = Sets.cartesianProduct(a.vertexSet(), b.vertexSet(), Pair::new).toSet();
-        Set<Pair<A, B>> requiredVertices = new LinkedHashSet<>();
-
-        for (Pair<A, B> vertex : possibleVertices) {
-            Map<L, Pair<Set<A>, Set<B>>> inNeighbors = this.getInNeighbors(a, b, vertex);
-            Map<L, Double> inCoefficients = this.calculateFilteredCoefficients(inNeighbors);
-
-            Map<L, Pair<Set<A>, Set<B>>> outNeighbors = this.getOutNeighbors(a, b, vertex);
-            Map<L, Double> outCoefficients = this.calculateFilteredCoefficients(outNeighbors);
-
-            if (inCoefficients.isEmpty() && outCoefficients.isEmpty()) {
-                continue;
-            }
-
-            propagation.addVertex(vertex);
-            requiredVertices.add(vertex);
-
-            this.addEdgesToAllNeighbors(propagation, vertex, inNeighbors, inCoefficients);
-            this.addEdgesToAllNeighbors(propagation, vertex, outNeighbors, outCoefficients);
-        }
-
-        propagation.removeAllVertices(Sets.difference(possibleVertices, requiredVertices).toSet());
-
-        return propagation;
-    }
-
-    /**
-     * Change the vertex type of the propagation graph from {@link Pair} to {@link Integer}.
-     * This is done to improve performance, as hashing and comparing integers is faster.
-     * The integers are indices into the mapping list.
-     */
-    private DirectedWeightedMultigraph<Integer, Edge> changeVertexType(List<Pair<A, B>> vertices,
-            DirectedWeightedMultigraph<Pair<A, B>, Edge> propagationGraph) {
-        Map<Pair<A, B>, Integer> vertexMapping = IntStream.range(0, vertices.size()).boxed().collect(Collectors.toMap(vertices::get, Function.identity()));
-
-        DirectedWeightedMultigraph<Integer, Edge> newGraph = new DirectedWeightedMultigraph<>(null, Edge::new);
-
-        for (Pair<A, B> vertex : propagationGraph.vertexSet()) {
-            newGraph.addVertex(vertexMapping.get(vertex));
-        }
-
-        for (Edge edge : propagationGraph.edgeSet()) {
-            Pair<A, B> source = propagationGraph.getEdgeSource(edge);
-            Pair<A, B> target = propagationGraph.getEdgeTarget(edge);
-
-            Edge newEdge = newGraph.addEdge(vertexMapping.get(source), vertexMapping.get(target));
-            newGraph.setEdgeWeight(newEdge, propagationGraph.getEdgeWeight(edge));
-        }
-
-        return newGraph;
-    }
-
-    /**
-     * Propagate the similarities of each vertex along the edges of the propagation graph.
-     * The edge weights are used as coefficients.
-     * This method is deterministic as addition is commutative.
-     */
-    private List<Double> floodSimilarities(DirectedWeightedMultigraph<Integer, Edge> propagationGraph, List<Double> previousMapping) {
-        List<Double> nextMapping = new ArrayList<>(previousMapping.size());
-
-        for (int vertex = 0; vertex < previousMapping.size(); vertex++) {
-            Set<Edge> edges = propagationGraph.incomingEdgesOf(vertex);
-
-            double similarity = 0.0;
-
-            for (Edge edge : edges) {
-                int source = propagationGraph.getEdgeSource(edge);
-                double coefficient = propagationGraph.getEdgeWeight(edge);
-
-                similarity += coefficient * previousMapping.get(source);
-            }
-
-            nextMapping.add(similarity);
-        }
-
-        return nextMapping;
-    }
-
-    /**
-     * The Euclidean distance of the two mappings, interpreted as vectors.
-     */
-    private double residuum(List<Double> previousMapping, List<Double> nextMapping) {
-        double residuum = 0.0;
-
-        for (int i = 0; i < previousMapping.size(); i++) {
-            double delta = Math.abs(previousMapping.get(i) - nextMapping.get(i));
-            residuum += delta * delta;
-        }
-
-        return Math.sqrt(residuum);
-    }
-
-    private static final class Edge extends DefaultWeightedEdge {
-    }
-}
diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/similarityflooding/SimilarityMapping.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/similarityflooding/SimilarityMapping.java
deleted file mode 100644
index ddcc890cf..000000000
--- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramconsistency/common/similarityflooding/SimilarityMapping.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/* Licensed under MIT 2023. */
-package edu.kit.kastel.mcse.ardoco.core.api.diagramconsistency.common.similarityflooding;
-
-import java.util.Collection;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.function.Function;
-
-import org.jgrapht.alg.util.Pair;
-
-import edu.kit.kastel.mcse.ardoco.core.architecture.Deterministic;
-
-/**
- * Stores the similarities of pairs of elements.
- *
- * @param <A>
- *            The vertex type of the first graph.
- * @param <B>
- *            The vertex type of the second graph.
- */
-@Deterministic
-public class SimilarityMapping<A, B> {
-    private final Map<Pair<A, B>, Double> similarities = new LinkedHashMap<>();
-    private final Function<Pair<A, B>, Double> defaultProvider;
-
-    /**
-     * Create a new instance of the SimilarityMap, where every element is mapped to the given similarity.
-     *
-     * @param defaultSimilarity
-     *                          The similarity to use for every element.
-     */
-    public SimilarityMapping(double defaultSimilarity) {
-        this.defaultProvider = pair -> defaultSimilarity;
-    }
-
-    /**
-     * Create a new instance of the SimilarityMap, where every element is mapped to the similarity provided by the given
-     * function. The function is never called more than once for the same element.
-     *
-     * @param defaultProvider
-     *                        The function that provides the similarity for every element.
-     */
-    public SimilarityMapping(Function<Pair<A, B>, Double> defaultProvider) {
-        this.defaultProvider = defaultProvider;
-    }
-
-    /**
-     * Initialize with two lists that can be zipped together.
-     *
-     * @param entries
-     *                     The list of entries.
-     * @param similarities
-     *                     The list of similarities.
-     */
-    public SimilarityMapping(List<Pair<A, B>> entries, List<Double> similarities) {
-        this.defaultProvider = pair -> {
-            throw new IllegalArgumentException("No similarity for pair " + pair);
-        };
-
-        if (entries.size() != similarities.size()) {
-            throw new IllegalArgumentException("The number of entries and similarities must be equal.");
-        }
-
-        for (int i = 0; i < entries.size(); i++) {
-            this.similarities.put(entries.get(i), similarities.get(i));
-        }
-    }
-
-    /**
-     * Get all elements that have an explicit similarity mapping.
-     *
-     * @return The set of elements.
-     */
-    public Set<Pair<A, B>> getMappedElements() {
-        return this.similarities.keySet();
-    }
-
-    /**
-     * Get all similarities of the given elements.
-     *
-     * @param entries
-     *                The elements.
-     * @return Their similarities.
-     */
-    public List<Double> getMappedValues(List<Pair<A, B>> entries) {
-        return entries.stream().map(this::getSimilarity).toList();
-    }
-
-    /**
-     * Update the similarity of a pair of elements.
-     *
-     * @param pair
-     *                   The element pair.
-     * @param similarity
-     *                   The new similarity.
-     */
-    public void updateSimilarity(Pair<A, B> pair, double similarity) {
-        this.similarities.put(pair, similarity);
-    }
-
-    /**
-     * Get the similarity of a pair of elements.
-     *
-     * @param pair
-     *             The element pair.
-     * @return The similarity of the pair.
-     */
-    public double getSimilarity(Pair<A, B> pair) {
-        return this.similarities.computeIfAbsent(pair, this.defaultProvider);
-    }
-
-    /**
-     * Get the similarity of a pair of elements.
-     *
-     * @param a
-     *          The first element of the pair.
-     * @param b
-     *          The second element of the pair.
-     * @return The similarity of the pair.
-     */
-    public double getSimilarity(A a, B b) {
-        return this.getSimilarity(new Pair<>(a, b));
-    }
-
-    /**
-     * Prepare the similarity map for the cartesian product of the given collections. This means that the default
-     * similarity is computed for every pair of elements.
-     *
-     * @param a
-     *          The first collection.
-     * @param b
-     *          The second collection.
-     */
-    public void prepareCartesian(Collection<A> a, Collection<B> b) {
-        for (A a1 : a) {
-            for (B b1 : b) {
-                this.getSimilarity(a1, b1);
-            }
-        }
-    }
-
-    @Override
-    public String toString() {
-        return this.similarities.toString();
-    }
-}
diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramrecognition/BoundingBox.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramrecognition/BoundingBox.java
deleted file mode 100644
index 8bae24782..000000000
--- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramrecognition/BoundingBox.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/* Licensed under MIT 2023-2024. */
-package edu.kit.kastel.mcse.ardoco.core.api.diagramrecognition;
-
-import java.io.Serializable;
-import java.util.Comparator;
-import java.util.Optional;
-
-import edu.kit.kastel.mcse.ardoco.core.common.util.SimilarityComparable;
-import edu.kit.kastel.mcse.ardoco.core.data.GlobalConfiguration;
-
-/**
- * This record represents a 2-dimensional bounding box spanning from the top left point (minX, minY) to (maxX, maxY) in an image where top left is (0,0).
- *
- * @param minX x coordinate of the left bounding box edge
- * @param minY y coordinate of the top bounding box edge
- * @param maxX x coordinate of the right bounding box edge
- * @param maxY y coordinate of the bottom bounding box edge
- */
-public record BoundingBox(int minX, int minY, int maxX, int maxY) implements Comparable<BoundingBox>, SimilarityComparable<BoundingBox>, Serializable {
-
-    /**
-     * Threshold used by the IoU to determine whether bounding boxes are similar using {@link #similar(GlobalConfiguration, BoundingBox)}.
-     */
-    public static final double SIMILARITY_THRESHOLD = 0.7;
-
-    /**
-     * Tries calculating a new bounding box of the intersection between this and another bounding box. If the bounding boxes do not intersect, an empty optional
-     * is provided.
-     *
-     * @param other another bounding box
-     * @return the optional bounding box
-     */
-    public Optional<BoundingBox> intersect(BoundingBox other) {
-        if (minX() > other.maxX() || maxX() < other.minX() || minY() > other.maxY() || maxY() < other.minY())
-            return Optional.empty();
-        return Optional.of(new BoundingBox(Math.max(minX(), other.minX()), Math.max(minY(), other.minY()), Math.min(maxX(), other.maxX()), Math.min(maxY(),
-                other.maxY())));
-    }
-
-    /**
-     * Calculates the area of union between this and another bounding box.
-     *
-     * @param other another bounding box
-     * @return the area >= 0
-     */
-    public double union(BoundingBox other) {
-        var i = intersect(other).map(BoundingBox::area).orElse(0.0);
-        return area() + other.area() - i;
-    }
-
-    /**
-     * Calculates the bounding box of this and another bounding box.
-     *
-     * @param other another bounding box
-     * @return a new bounding box
-     */
-    public BoundingBox combine(BoundingBox other) {
-        return new BoundingBox(Math.min(minX, other.minX), Math.max(maxX, other.maxX), Math.min(minY, other.minY), Math.max(maxY, other.maxY));
-    }
-
-    /**
-     * @return the area of a bounding box, area &gt;= 0
-     */
-    public double area() {
-        return ((double) maxX() - minX()) * (maxY() - minY());
-    }
-
-    /**
-     * Calculates the intersection over union metric for this bounding box with another bounding box. This metric is the fraction of the intersection with the
-     * union of two bounding boxes. If the bounding boxes are identical, this will produce return 1. If the bounding boxes do not intersect, it will return 0
-     * instead. For any other case, a value in the range (0,1) is returned depending on the relative overlap.
-     *
-     * @param other another bounding box
-     * @return iou in the range [0,1]
-     */
-    public double intersectionOverUnion(BoundingBox other) {
-        return intersect(other).map(i -> i.area() / union(other)).orElse(0.0);
-    }
-
-    /**
-     * The percentage of another bounding box that is contained in this instance.
-     *
-     * @param other another bounding box
-     * @return percentage in the range [0,1]
-     */
-    public double contains(BoundingBox other) {
-        return contains(other, false);
-    }
-
-    /**
-     * The percentage of another bounding box that is contained in this instance. If the considerArea flag is set, a smaller box can not contain a larger box.
-     * Returns a value in the range [0,1] with 1 representing an entirely contained box.
-     *
-     * @param other        a {@link BoundingBox}
-     * @param considerArea whether the area of both boxes should be considered
-     * @return percentage in the range [0,1]
-     */
-    public double contains(BoundingBox other, boolean considerArea) {
-        if (considerArea && other.area() > area())
-            return 0.0;
-        return intersect(other).map(i -> i.area() / other.area()).orElse(0.0);
-    }
-
-    /**
-     * Whether this instance contains another bounding box entirely.
-     *
-     * @param other a {@link BoundingBox}
-     * @return true if contained entirely, false otherwise
-     */
-    public boolean containsEntirely(BoundingBox other) {
-        return Double.compare(contains(other, true), 1.0) == 0;
-    }
-
-    /**
-     * {@return the width}
-     */
-    public int width() {
-        return maxX - minX;
-    }
-
-    /**
-     * {@return the height}
-     */
-    public int height() {
-        return maxY - minY;
-    }
-
-    /**
-     * {@return the bounding box coordinates in the order minX, minY, maxX, maxY}
-     */
-    public int[] toCoordinates() {
-        return new int[] { minX, minY, maxX, maxY };
-    }
-
-    @Override
-    public boolean similar(GlobalConfiguration globalConfiguration, BoundingBox obj) {
-        if (equals(obj))
-            return true;
-        return intersectionOverUnion(obj) > SIMILARITY_THRESHOLD;
-    }
-
-    @Override
-    public int compareTo(BoundingBox o) {
-        if (equals(o))
-            return 0;
-        return Comparator.comparing(BoundingBox::minX)
-                .thenComparing(BoundingBox::minY)
-                .thenComparing(BoundingBox::maxX)
-                .thenComparing(BoundingBox::maxY)
-                .compare(this, o);
-    }
-}
diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramrecognition/Box.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramrecognition/Box.java
deleted file mode 100644
index a8cc95127..000000000
--- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramrecognition/Box.java
+++ /dev/null
@@ -1,286 +0,0 @@
-/* Licensed under MIT 2023-2024. */
-package edu.kit.kastel.mcse.ardoco.core.api.diagramrecognition;
-
-import static java.lang.Math.abs;
-
-import java.awt.*;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-import com.fasterxml.jackson.annotation.JacksonInject;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-/**
- * This class represents a box that is detected by the image recognition.
- */
-public class Box extends DiagramElement implements Serializable {
-    // the four coordinates x1,y1,x2,y2
-    @JsonProperty("box")
-    private int[] coordinates;
-    @JsonProperty
-    private double confidence;
-    @JsonProperty("class")
-    private String classification;
-    @JsonProperty("texts")
-    private List<TextBox> textBoxes = new ArrayList<>();
-    @JsonProperty("contained")
-    private List<String> containedBoxes = new ArrayList<>();
-    @JsonProperty("dominatingColor")
-    private Color dominatingColor = null;
-    @JsonIgnore
-    private SortedSet<String> references = new TreeSet<>();
-
-    protected static String calculateUUID(int[] coordinates) {
-        return String.format("Box [%s]", getBoundingBoxConcat(coordinates));
-    }
-
-    /**
-     * {@return the bounding box coordinates joined with hyphens}
-     *
-     * @param coordinates bounding box coordinates
-     */
-    public static String getBoundingBoxConcat(int[] coordinates) {
-        return Arrays.stream(coordinates).mapToObj((Integer::toString)).reduce((l, r) -> l + "-" + r).orElseThrow();
-    }
-
-    /**
-     * Create a new box that is detected on the image.
-     *
-     * @param diagram         the diagram the box belongs to
-     * @param uuid            the unique identifier of the box
-     * @param coordinates     the coordinates of two corners of the box in pixel. (x1,y1,x2,y2)
-     * @param confidence      a confidence value
-     * @param classification  the classification (e.g., "LABEL"), see {@link Classification} for further details
-     * @param textBoxes       the text boxes that are attached to this box
-     * @param dominatingColor a dominating color in the box (iff present)
-     */
-    public Box(Diagram diagram, String uuid, int[] coordinates, double confidence, String classification, List<TextBox> textBoxes, Color dominatingColor) {
-        super(diagram, uuid);
-        this.coordinates = coordinates;
-        this.confidence = confidence;
-        this.classification = classification;
-        this.textBoxes = textBoxes;
-        this.dominatingColor = dominatingColor;
-    }
-
-    /**
-     * Create a new box that is detected on the image.
-     *
-     * @param diagram         the diagram the box belongs to
-     * @param coordinates     the coordinates of two corners of the box in pixel. (x1,y1,x2,y2)
-     * @param confidence      a confidence value
-     * @param classification  the classification (e.g., "LABEL"), see {@link Classification} for further details
-     * @param textBoxes       the text boxes that are attached to this box
-     * @param dominatingColor a dominating color in the box (iff present)
-     */
-    public Box(Diagram diagram, int[] coordinates, double confidence, String classification, List<TextBox> textBoxes, Color dominatingColor) {
-        super(diagram, calculateUUID(coordinates));
-        this.coordinates = coordinates;
-        this.confidence = confidence;
-        this.classification = classification;
-        this.textBoxes = textBoxes;
-        this.dominatingColor = dominatingColor;
-    }
-
-    /**
-     * Create a new box that is detected on the image.
-     *
-     * @param diagram         the diagram this box belongs to
-     * @param uuid            the unique identifier of the box
-     * @param coordinates     the coordinates of two corners of the box in pixel. (x1,y1,x2,y2)
-     * @param confidence      a confidence value
-     * @param classification  the classification (e.g., "LABEL"), see {@link Classification} for further details
-     * @param dominatingColor a dominating color in the box (iff present)
-     */
-    @JsonCreator
-    public Box(@JacksonInject Diagram diagram, @JsonProperty("uuid") String uuid, @JsonProperty("box") int[] coordinates,
-            @JsonProperty("confidence") double confidence, @JsonProperty("class") String classification,
-            @JsonProperty("dominatingColor") Color dominatingColor) {
-        super(diagram, uuid == null ? calculateUUID(coordinates) : uuid);
-        this.coordinates = coordinates;
-        this.confidence = confidence;
-        this.classification = classification;
-        this.dominatingColor = dominatingColor;
-    }
-
-    /**
-     * Calculate the area of the box in square pixel.
-     *
-     * @return the area of the box
-     */
-    //TODO Delegate to bounding box class
-    public int area() {
-        return abs(coordinates[0] - coordinates[2]) * abs(coordinates[1] - coordinates[3]);
-    }
-
-    /**
-     * Get the identifier of this box
-     *
-     * @return a UUID of the box
-     */
-    public String getUUID() {
-        // We stored the UUID in name.
-        return getName();
-    }
-
-    /**
-     * Get the coordinates of two corners of the box in pixel. (x1,y1,x2,y2)
-     *
-     * @return the coordinates
-     */
-    public int[] getBox() {
-        return Arrays.copyOf(coordinates, coordinates.length);
-    }
-
-    /**
-     * Get the confidence of the recognized box.
-     *
-     * @return a confidence value
-     */
-    public double getConfidence() {
-        return confidence;
-    }
-
-    /**
-     * Get the classification (e.g., "LABEL").
-     *
-     * @return the classification
-     */
-    public Classification getClassification() {
-        return Classification.byString(classification);
-    }
-
-    /**
-     * Add a text box that shall be associated with the box.
-     *
-     * @param textBox the textbox
-     */
-    public void addTextBox(TextBox textBox) {
-        this.textBoxes.add(Objects.requireNonNull(textBox));
-    }
-
-    /**
-     * Mark another box as contained in this box.
-     *
-     * @param box the contained box
-     */
-    public void addContainedBox(Box box) {
-        this.containedBoxes.add(Objects.requireNonNull(box.getUUID()));
-    }
-
-    /**
-     * Get all boxes that have been marked as contained in this box.
-     * More boxes might be contained, to find these the overlapping area of the boxes has to be calculated.
-     *
-     * @return all contained boxes
-     */
-    public List<String> getContainedBoxes() {
-        return new ArrayList<>(containedBoxes);
-    }
-
-    /**
-     * Remove a text box that is associated with the box.
-     *
-     * @param textBox the textbox
-     */
-    public void removeTextBox(TextBox textBox) {
-        Objects.requireNonNull(textBox);
-        this.textBoxes.removeIf(it -> it == textBox);
-    }
-
-    /**
-     * Get all text boxes that are associated with the box.
-     *
-     * @return all associated text boxes
-     */
-    public List<TextBox> getTexts() {
-        return new ArrayList<>(textBoxes);
-    }
-
-    public SortedSet<String> getReferences() {
-        return new TreeSet<>(references);
-    }
-
-    /**
-     * Adds a new reference to the set of references.
-     *
-     * @param reference the reference string
-     * @return true if the reference wasn't already contained, false otherwise
-     */
-    public boolean addReference(String reference) {
-        return references.add(reference);
-    }
-
-    public void setReferences(List<String> references) {
-        this.references = new TreeSet<>(references);
-    }
-
-    /**
-     * Tries to remove the given reference from the references
-     *
-     * @param reference the reference
-     * @return true if removed, false otherwise
-     */
-    public boolean removeReference(String reference) {
-        return references.remove(reference);
-    }
-
-    /**
-     * Get the dominating color of the box (iff present)
-     *
-     * @return the dominating color or {@code null} if not present
-     */
-    public Color getDominatingColor() {
-        return dominatingColor;
-    }
-
-    /**
-     * Set the dominating color of the box as RGB value.
-     *
-     * @param dominatingColor the dominating color
-     */
-    public void setDominatingColor(Color dominatingColor) {
-        this.dominatingColor = dominatingColor;
-    }
-
-    @Override
-    public BoundingBox getBoundingBox() {
-        return new BoundingBox(coordinates[0], coordinates[1], coordinates[2], coordinates[3]);
-    }
-
-    @Override
-    public String toString() {
-        return toString(true);
-    }
-
-    /**
-     * Returns a string representation of the box, if wrap is set to true, the class name is appended before string
-     *
-     * @param wrap whether the class name should be appended
-     * @return a string representation of the box
-     */
-    public String toString(boolean wrap) {
-        var formatted = String.format("%s %s", Arrays.stream(coordinates).mapToObj((Integer::toString)).reduce((l, r) -> l + "-" + r).orElseThrow(),
-                getReferences().stream().findFirst().orElse("REFERENCES_NOT_SET"));
-        if (wrap)
-            return String.format("Box [%s]", formatted);
-        return formatted;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        return super.equals(obj) && obj instanceof Box otherBox && this.textBoxes.equals(otherBox.textBoxes);
-    }
-
-    @Override
-    public int hashCode() {
-        return super.hashCode();
-    }
-}
diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramrecognition/Classification.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramrecognition/Classification.java
deleted file mode 100644
index 94fada7ea..000000000
--- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramrecognition/Classification.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Licensed under MIT 2023. */
-package edu.kit.kastel.mcse.ardoco.core.api.diagramrecognition;
-
-import java.util.Objects;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public enum Classification {
-    // All available ..
-    // 'ClassNode', 'Qualifier', 'NAryAssociationDiamond', 'Package', 'Comment', 'Label', 'Aggregation', 'Composition', 'Extension', 'Dependency', 'Realization', 'CommentConnection', 'AssociationUnidirectional', 'AssociationBidirectional'
-    LABEL("Label"), CLASS("ClassNode"),
-
-    // Artificial Classes
-    TEXT("TEXT"), RAWTEXT("RAWTEXT"), UNKNOWN(null);
-
-    private static final Logger logger = LoggerFactory.getLogger(Classification.class);
-    private final String classificationString;
-
-    Classification(String classificationString) {
-        this.classificationString = classificationString;
-    }
-
-    public String getClassificationString() {
-        return classificationString;
-    }
-
-    public static Classification byString(String classificationString) {
-        for (Classification cls : values()) {
-            if (Objects.equals(cls.classificationString, classificationString))
-                return cls;
-        }
-        logger.error("Found new classification, defaulting to UNKNOWN: {}", classificationString);
-        return Classification.UNKNOWN;
-    }
-}
diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramrecognition/Connector.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramrecognition/Connector.java
deleted file mode 100644
index 263147720..000000000
--- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramrecognition/Connector.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Licensed under MIT 2023-2024. */
-package edu.kit.kastel.mcse.ardoco.core.api.diagramrecognition;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-
-public final class Connector implements Serializable {
-    private String uuid = UUID.randomUUID().toString();
-    private List<String> connectedBoxes;
-    private List<TextBox> texts = new ArrayList<>();
-
-    @SuppressWarnings("unused")
-    private Connector() {
-        // Jackson JSON
-    }
-
-    public Connector(String uuid, List<String> connectedBoxes, List<TextBox> texts) {
-        this.uuid = uuid;
-        this.connectedBoxes = connectedBoxes;
-        this.texts = texts;
-    }
-
-    public String getUUID() {
-        return uuid;
-    }
-
-    public List<String> getConnectedBoxes() {
-        return new ArrayList<>(connectedBoxes);
-    }
-
-    public List<TextBox> getTexts() {
-        return new ArrayList<>(texts);
-    }
-}
diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramrecognition/Diagram.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramrecognition/Diagram.java
deleted file mode 100644
index 44f65547f..000000000
--- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramrecognition/Diagram.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/* Licensed under MIT 2023-2024. */
-package edu.kit.kastel.mcse.ardoco.core.api.diagramrecognition;
-
-import java.io.File;
-import java.io.Serializable;
-import java.util.List;
-
-import edu.kit.kastel.mcse.ardoco.core.common.util.SimilarityComparable;
-import edu.kit.kastel.mcse.ardoco.core.data.GlobalConfiguration;
-
-/**
- * Programmatically represents an informal diagram. A diagram is uniquely identified by its (resource) name and can contain an arbitrary number of diagram
- * elements and connectors between them.
- */
-public interface Diagram extends Comparable<Diagram>, SimilarityComparable<Diagram>, Serializable {
-    /**
-     * {@return the full (resource) name of the diagram, e.g. "some/path/to/some-diagram.jpg"}
-     */
-    String getResourceName();
-
-    /**
-     * {@return the short (resource) name of the diagram, e.g. "some-diagram.jpg"}
-     */
-    default String getShortResourceName() {
-        var split = getResourceName().split("/|(\\\\)");
-        return split[split.length - 1];
-    }
-
-    File getLocation();
-
-    void addBox(Box box);
-
-    boolean removeBox(Box box);
-
-    List<Box> getBoxes();
-
-    void addTextBox(TextBox textBox);
-
-    boolean removeTextBox(TextBox textBox);
-
-    /**
-     * Returns the raw text boxes that are attached to this diagram. This method does not return the text boxes that are attached to the boxes of this diagram.
-     *
-     * @return the raw text boxes that are attached to this diagram
-     */
-    List<TextBox> getTextBoxes();
-
-    void addConnector(Connector connector);
-
-    boolean removeConnector(Connector connector);
-
-    List<Connector> getConnectors();
-
-    @Override
-    default boolean similar(GlobalConfiguration globalConfiguration, Diagram obj) {
-        if (equals(obj))
-            return true;
-        if (getResourceName().equals(obj.getResourceName())) {
-            return SimilarityComparable.similar(globalConfiguration, getBoxes(), obj.getBoxes());
-        }
-        return false;
-    }
-
-    @Override
-    default int compareTo(Diagram o) {
-        if (equals(o))
-            return 0;
-        return getResourceName().compareTo(o.getResourceName());
-    }
-}
diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramrecognition/DiagramElement.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramrecognition/DiagramElement.java
deleted file mode 100644
index 345a7e36f..000000000
--- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramrecognition/DiagramElement.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/* Licensed under MIT 2023-2024. */
-package edu.kit.kastel.mcse.ardoco.core.api.diagramrecognition;
-
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-
-import org.eclipse.collections.api.set.sorted.ImmutableSortedSet;
-import org.eclipse.collections.impl.factory.SortedSets;
-
-import edu.kit.kastel.mcse.ardoco.core.api.models.Entity;
-import edu.kit.kastel.mcse.ardoco.core.api.models.ModelElement;
-import edu.kit.kastel.mcse.ardoco.core.common.util.SimilarityComparable;
-import edu.kit.kastel.mcse.ardoco.core.data.GlobalConfiguration;
-
-/**
- * This box represents a geometrical shape with an arbitrary amount of text from a diagram. An element can be uniquely identified by its bounding box or UID and
- * the diagram it belongs to.
- */
-public abstract class DiagramElement extends Entity implements SimilarityComparable<DiagramElement> {
-    private final Diagram diagram;
-    private DiagramElement parent;
-    private List<DiagramElement> children;
-
-    /**
-     * Creates a new diagram element that is associated with the given diagram and unique identifier.
-     *
-     * @param diagram the diagram this element is associated with
-     * @param uuid    the unique identifier
-     */
-    protected DiagramElement(Diagram diagram, String uuid) {
-        super(uuid);
-        this.diagram = diagram;
-    }
-
-    /**
-     * Returns a {@link BoundingBox}, which encases the element.
-     *
-     * @return the {@link BoundingBox}
-     */
-    public abstract BoundingBox getBoundingBox();
-
-    /**
-     * Returns the {@link Diagram}, which this element belongs to.
-     *
-     * @return the {@link Diagram}
-     */
-    public Diagram getDiagram() {
-        return this.diagram;
-    }
-
-    /**
-     * {@return the set of elements which are direct children of this diagram element} Determined indirectly by searching for diagram elements in the diagram
-     * which reference this element as their parent.
-     *
-     * @see #getParent()
-     */
-    public ImmutableSortedSet<DiagramElement> getChildren() {
-        if (children == null) {
-            var all = getDiagram().getBoxes();
-            this.children = new ArrayList<>(all.stream()
-                    .filter(de -> !de.equals(DiagramElement.this) && de.getParent().map(p -> p == DiagramElement.this).orElse(false))
-                    .map(b -> (DiagramElement) b)
-                    .toList());
-        }
-        return SortedSets.immutable.withAll(children);
-    }
-
-    /**
-     * {@return the optional parent of this element, empty if this diagram element is at the top-most level} Searches the diagram for diagram elements whose
-     * bounding box entirely contain this element. The diagram element with the smallest area is chosen as parent.
-     *
-     * @see BoundingBox#containsEntirely(BoundingBox)
-     */
-    public Optional<DiagramElement> getParent() {
-        if (parent == null) {
-            var all = getDiagram().getBoxes();
-            parent = all.stream()
-                    .filter(de -> !de.equals(DiagramElement.this) && de.getBoundingBox().containsEntirely(getBoundingBox())) //Find boxes containing this element
-                    .min(Comparator.comparingDouble(de -> de.getBoundingBox().area()))
-                    .orElse(null);
-        }
-        return Optional.ofNullable(parent);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj instanceof DiagramElement other) {
-            return Objects.equals(getDiagram().getResourceName(), other.getDiagram().getResourceName()) && getBoundingBox().equals(other.getBoundingBox());
-        }
-        return false;
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(getDiagram().getResourceName(), getBoundingBox());
-    }
-
-    @Override
-    public int compareTo(ModelElement o) {
-        if (equals(o))
-            return 0;
-        if (o instanceof DiagramElement other) {
-            return Comparator.comparing(DiagramElement::getDiagram).thenComparing(DiagramElement::getBoundingBox).compare(this, other);
-        }
-        return super.compareTo(o);
-    }
-
-    @Override
-    public boolean similar(GlobalConfiguration globalConfiguration, DiagramElement obj) {
-        if (equals(obj))
-            return true;
-        if (diagram.getResourceName().equals(obj.diagram.getResourceName()))
-            return getBoundingBox().similar(globalConfiguration, obj.getBoundingBox());
-        return false;
-    }
-}
diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramrecognition/DiagramRecognitionState.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramrecognition/DiagramRecognitionState.java
deleted file mode 100644
index a235bf8f3..000000000
--- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramrecognition/DiagramRecognitionState.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/* Licensed under MIT 2023-2024. */
-package edu.kit.kastel.mcse.ardoco.core.api.diagramrecognition;
-
-import java.util.List;
-
-import edu.kit.kastel.mcse.ardoco.core.api.Disambiguation;
-import edu.kit.kastel.mcse.ardoco.core.data.PipelineStepData;
-
-/**
- * The diagram recognition state contains {@link Diagram Diagrams} that are detected in files of the project.
- */
-public interface DiagramRecognitionState extends PipelineStepData {
-    String ID = "DiagramRecognition";
-
-    /**
-     * Add a new diagram to the state that has not been processed yet.
-     *
-     * @param diagram the diagram
-     */
-    void addUnprocessedDiagram(Diagram diagram);
-
-    /**
-     * {@return an immutable list of unprocessed diagrams}
-     */
-    List<Diagram> getUnprocessedDiagrams();
-
-    /**
-     * Removes a diagram from the unprocessed diagrams
-     *
-     * @param diagram the diagram to remove
-     * @return true, if the diagram was removed successfully
-     */
-    boolean removeUnprocessedDiagram(Diagram diagram);
-
-    /**
-     * Add a new diagram to the state.
-     *
-     * @param diagram the diagram
-     */
-    void addDiagram(Diagram diagram);
-
-    /**
-     * Get a list of all recognized diagrams.
-     *
-     * @return all recognized diagrams
-     */
-    List<Diagram> getDiagrams();
-
-    /**
-     * Add a disambiguation to the state.
-     *
-     * @param disambiguation the disambiguation
-     * @return Whether it was added successfully
-     */
-    boolean addDisambiguation(Disambiguation disambiguation);
-
-    /**
-     * {@return a list of disambiguations that were discovered during the stage}
-     */
-    List<Disambiguation> getDisambiguations();
-}
diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramrecognition/DiagramUtil.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramrecognition/DiagramUtil.java
deleted file mode 100644
index 6aa018d0d..000000000
--- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramrecognition/DiagramUtil.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/* Licensed under MIT 2023-2024. */
-package edu.kit.kastel.mcse.ardoco.core.api.diagramrecognition;
-
-import java.util.SortedMap;
-import java.util.SortedSet;
-import java.util.TreeMap;
-import java.util.TreeSet;
-
-import edu.kit.kastel.mcse.ardoco.core.api.recommendationgenerator.RecommendedInstance;
-import edu.kit.kastel.mcse.ardoco.core.api.text.Word;
-import edu.kit.kastel.mcse.ardoco.core.api.textextraction.NounMapping;
-import edu.kit.kastel.mcse.ardoco.core.common.util.wordsim.WordSimUtils;
-import edu.kit.kastel.mcse.ardoco.core.common.util.wordsim.strategy.MaximumStrategy;
-
-/**
- * Provides utility methods that are shared by {@link edu.kit.kastel.mcse.ardoco.core.pipeline.agent.Informant informants} of diagram related stages.
- */
-public class DiagramUtil {
-    private DiagramUtil() {
-        throw new IllegalStateException("Cannot be instantiated");
-    }
-
-    /**
-     * Returns the map containing the highest similarity of each word contained by the recommended instance to any word contained by the box.
-     *
-     * @param wordSimUtils        the word similarity utils to use for comparison
-     * @param box                 the box the target words are extracted from
-     * @param recommendedInstance the recommended instance the words are extracted from
-     * @return the map
-     * @see #calculateSimilarityMap(WordSimUtils, SortedSet, SortedSet)
-     */
-    public static SortedMap<Word, Double> calculateSimilarityMap(WordSimUtils wordSimUtils, Box box, RecommendedInstance recommendedInstance) {
-        var deNames = box.getReferences();
-        var words = new TreeSet<>(recommendedInstance.getNameMappings().stream().flatMap(nm -> nm.getWords().stream()).toList());
-        return calculateSimilarityMap(wordSimUtils, words, deNames);
-    }
-
-    /**
-     * {@return the map containing the highest similarity of each word to any word from the target words}
-     *
-     * @param wordSimUtils the word similarity utils to use for comparison
-     * @param words        the words
-     * @param targets      the target words
-     */
-    private static SortedMap<Word, Double> calculateSimilarityMap(WordSimUtils wordSimUtils, SortedSet<Word> words, SortedSet<String> targets) {
-        var map = new TreeMap<Word, Double>();
-        words.forEach(w -> map.put(w, calculateHighestSimilarity(wordSimUtils, w, targets)));
-
-        return new TreeMap<>(map);
-    }
-
-    /**
-     * {@return the highest similarity of the word to any word from the target words}
-     *
-     * @param wordSimUtils the word similarity utils to use for comparison
-     * @param word         the word
-     * @param targets      the target words
-     */
-    private static double calculateHighestSimilarity(WordSimUtils wordSimUtils, Word word, SortedSet<String> targets) {
-        return targets.stream()
-                .map(name -> wordSimUtils.getSimilarity(word.getText(), name, new MaximumStrategy(), true))
-                .max(Double::compareTo)
-                .orElse(Double.MIN_VALUE);
-    }
-
-    /**
-     * {@return the highest similarity between a word from the noun mapping and a box reference}
-     *
-     * @param wordSimUtils the word similarity utils to use for comparison
-     * @param nounMapping  the noun mapping
-     * @param box          the box
-     */
-    public static double calculateHighestSimilarity(WordSimUtils wordSimUtils, NounMapping nounMapping, Box box) {
-        return nounMapping.getReferenceWords().stream().map(word -> calculateHighestSimilarity(wordSimUtils, word, box)).max(Double::compareTo).orElse(0.0);
-    }
-
-    /**
-     * {@return the highest similarity between the word and a box reference}
-     *
-     * @param wordSimUtils the word similarity utils to use for comparison
-     * @param word         the word
-     * @param box          the box
-     */
-    public static double calculateHighestSimilarity(WordSimUtils wordSimUtils, Word word, Box box) {
-        return calculateHighestSimilarity(wordSimUtils, word, box.getReferences());
-    }
-}
diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramrecognition/TextBox.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramrecognition/TextBox.java
deleted file mode 100644
index c8ea5bcb5..000000000
--- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/diagramrecognition/TextBox.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/* Licensed under MIT 2023-2024. */
-package edu.kit.kastel.mcse.ardoco.core.api.diagramrecognition;
-
-import java.awt.*;
-import java.io.Serializable;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import edu.kit.kastel.mcse.ardoco.core.common.util.SimilarityComparable;
-import edu.kit.kastel.mcse.ardoco.core.data.GlobalConfiguration;
-
-/**
- * A text
- */
-public class TextBox implements SimilarityComparable<TextBox>, Serializable {
-    private static final double SIMILARITY_THRESHOLD = 0.85;
-    private final BoundingBox boundingBox;
-    private final double confidence;
-    private final String text;
-    private Color dominatingColor = null;
-
-    public TextBox(BoundingBox boundingBox, double confidence, String text) {
-        this.boundingBox = boundingBox;
-        this.confidence = confidence;
-        this.text = text;
-    }
-
-    public TextBox(BoundingBox boundingBox, double confidence, String text, Color dominatingColor) {
-        this(boundingBox, confidence, text);
-        this.dominatingColor = dominatingColor;
-    }
-
-    @JsonCreator
-    public TextBox(@JsonProperty("x") int xCoordinate, @JsonProperty("y") int yCoordinate, @JsonProperty("w") int width, @JsonProperty("h") int height,
-            @JsonProperty("confidence") double confidence, @JsonProperty("text") String text) {
-        this(new BoundingBox(xCoordinate, yCoordinate, xCoordinate + width, yCoordinate + height), confidence, text);
-    }
-
-    public TextBox(int x, int y, int w, int h, double confidence, String text, Color dominatingColor) {
-        this(x, y, w, h, confidence, text);
-        this.setDominatingColor(dominatingColor);
-    }
-
-    /**
-     * Get the coordinates of the absolute box as (x1,y1,x2,y2) in pixel.
-     *
-     * @return the absolute coordinates of the box
-     */
-    public int[] absoluteBox() {
-        return new int[] { boundingBox.minX(), boundingBox.minY(), boundingBox.maxX(), boundingBox.maxY() };
-    }
-
-    public BoundingBox getBoundingBox() {
-        return boundingBox;
-    }
-
-    public int area() {
-        return getWidth() * getHeight();
-    }
-
-    public int getXCoordinate() {
-        return boundingBox.minX();
-    }
-
-    public int getYCoordinate() {
-        return boundingBox.minY();
-    }
-
-    public int getWidth() {
-        return boundingBox.width();
-    }
-
-    public int getHeight() {
-        return boundingBox.height();
-    }
-
-    public double getConfidence() {
-        return confidence;
-    }
-
-    public String getText() {
-        return text;
-    }
-
-    public Color getDominatingColor() {
-        return dominatingColor;
-    }
-
-    public void setDominatingColor(Color dominatingColor) {
-        this.dominatingColor = dominatingColor;
-    }
-
-    @Override
-    public String toString() {
-        return String.format("TextBox [text=%s]", getText());
-    }
-
-    @Override
-    public boolean similar(GlobalConfiguration globalConfiguration, TextBox obj) {
-        if (equals(obj))
-            return true;
-        return globalConfiguration.getWordSimUtils().getSimilarity(text, obj.text) > SIMILARITY_THRESHOLD && boundingBox.similar(globalConfiguration,
-                obj.boundingBox);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj instanceof TextBox other) {
-            return boundingBox.equals(other.boundingBox) && text.equals(other.text);
-        }
-        return super.equals(obj);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(boundingBox, text);
-    }
-}
diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/models/tracelinks/diagrams/DiagramGoldStandardTraceLink.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/models/tracelinks/diagrams/DiagramGoldStandardTraceLink.java
deleted file mode 100644
index b5e83bd38..000000000
--- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/models/tracelinks/diagrams/DiagramGoldStandardTraceLink.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/* Licensed under MIT 2023-2024. */
-package edu.kit.kastel.mcse.ardoco.core.api.models.tracelinks.diagrams;
-
-import java.util.Comparator;
-import java.util.Objects;
-
-import edu.kit.kastel.mcse.ardoco.core.api.diagramrecognition.DiagramElement;
-import edu.kit.kastel.mcse.ardoco.core.api.text.Sentence;
-
-public class DiagramGoldStandardTraceLink extends DiagramTextTraceLink {
-    private final String goldStandard;
-    private final TraceType traceType;
-
-    /**
-     * Creates a tracelink between a diagram element and a sentence number
-     *
-     * @param diagramElement diagram element
-     * @param sentence       sentence
-     * @param projectName    project name
-     * @param goldStandard   path to the textual gold standard file
-     */
-    public DiagramGoldStandardTraceLink(DiagramElement diagramElement, Sentence sentence, String projectName, String goldStandard) {
-        this(diagramElement, sentence, projectName, goldStandard, TraceType.ENTITY);
-    }
-
-    /**
-     * Creates a tracelink between a diagram element and a sentence number
-     *
-     * @param diagramElement diagram element
-     * @param sentence       sentence
-     * @param projectName    project name
-     * @param goldStandard   path to the textual gold standard file
-     * @param traceType      type of the trace
-     */
-    public DiagramGoldStandardTraceLink(DiagramElement diagramElement, Sentence sentence, String projectName, String goldStandard, TraceType traceType) {
-        super(diagramElement, sentence, projectName);
-        this.goldStandard = goldStandard;
-        this.traceType = traceType;
-    }
-
-    /**
-     * {@return the path to the goldstandard text file}
-     */
-    public String getGoldStandard() {
-        return goldStandard;
-    }
-
-    /**
-     * {@return the type of this trace}
-     */
-    public TraceType getTraceType() {
-        return traceType;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (obj instanceof DiagramGoldStandardTraceLink other) {
-            return Objects.equals(getGoldStandard(), other.getGoldStandard()) && Objects.equals(getDiagramElement(), other.getDiagramElement()) && Objects
-                    .equals(getSentenceNo(), other.getSentenceNo()) && Objects.equals(getTraceType(), other.getTraceType());
-        }
-        return super.equals(obj);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(getSentenceNo(), getDiagramElement(), getGoldStandard(), getTraceType());
-    }
-
-    @Override
-    public int compareTo(DiagramTextTraceLink o) {
-        if (equals(o))
-            return 0;
-        if (o instanceof DiagramWordTraceLink)
-            return -1;
-        if (o instanceof DiagramGoldStandardTraceLink other) {
-            return Comparator.comparing(DiagramGoldStandardTraceLink::getGoldStandard)
-                    .thenComparing(DiagramGoldStandardTraceLink::getDiagramElement)
-                    .thenComparingInt(DiagramGoldStandardTraceLink::getSentenceNo)
-                    .thenComparing(DiagramGoldStandardTraceLink::getTraceType)
-                    .compare(this, other);
-        }
-        return super.compareTo(o);
-    }
-
-    @Override
-    public String toString() {
-        return String.format("%s-[%s]", super.toString(), getTraceType().name());
-    }
-}
diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/models/tracelinks/diagrams/DiagramTextTraceLink.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/models/tracelinks/diagrams/DiagramTextTraceLink.java
deleted file mode 100644
index ad8359120..000000000
--- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/models/tracelinks/diagrams/DiagramTextTraceLink.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/* Licensed under MIT 2023-2024. */
-package edu.kit.kastel.mcse.ardoco.core.api.models.tracelinks.diagrams;
-
-import java.io.Serializable;
-import java.text.MessageFormat;
-import java.util.Objects;
-
-import edu.kit.kastel.mcse.ardoco.core.api.diagramrecognition.DiagramElement;
-import edu.kit.kastel.mcse.ardoco.core.api.text.Sentence;
-import edu.kit.kastel.mcse.ardoco.core.common.util.SimilarityComparable;
-import edu.kit.kastel.mcse.ardoco.core.data.GlobalConfiguration;
-
-public class DiagramTextTraceLink implements SimilarityComparable<DiagramTextTraceLink>, Comparable<DiagramTextTraceLink>, Serializable {
-    protected final DiagramElement diagramElement;
-    protected final Sentence sentence;
-    protected final String projectName;
-
-    /**
-     * Creates a tracelink between a diagram element and a sentence
-     *
-     * @param diagramElement diagram element
-     * @param sentence       sentence
-     * @param projectName    project name
-     */
-    public DiagramTextTraceLink(DiagramElement diagramElement, Sentence sentence, String projectName) {
-        this.diagramElement = diagramElement;
-        this.sentence = sentence;
-        this.projectName = projectName;
-    }
-
-    public DiagramElement getDiagramElement() {
-        return diagramElement;
-    }
-
-    /**
-     * Gets the sentence number, indexing starts at 1.
-     *
-     * @return sentence number
-     */
-    public int getSentenceNo() {
-        return sentence.getSentenceNumberForOutput();
-    }
-
-    @Override
-    public String toString() {
-        return toString(true);
-    }
-
-    public String toString(boolean withSentence) {
-        if (withSentence) {
-            return MessageFormat.format("[{0}]-[{1}]-[{2}]", getDiagramElement(), getSentence().getSentenceNumberForOutput(), getSentence().getText());
-        }
-        return MessageFormat.format("[{0}]-[{1}]", getDiagramElement(), getSentence().getSentenceNumberForOutput());
-    }
-
-    public Sentence getSentence() {
-        return this.sentence;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        else if (obj instanceof DiagramTextTraceLink other) {
-            return Objects.equals(getSentenceNo(), other.getSentenceNo()) && Objects.equals(getDiagramElement(), other.getDiagramElement());
-        }
-        return false;
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(getSentenceNo(), getDiagramElement());
-    }
-
-    @Override
-    public int compareTo(DiagramTextTraceLink o) {
-        if (equals(o))
-            return 0;
-        var comp = getDiagramElement().compareTo(o.getDiagramElement());
-        if (comp == 0)
-            return getSentenceNo() - o.getSentenceNo();
-        return comp;
-    }
-
-    @Override
-    public boolean similar(GlobalConfiguration globalConfiguration, DiagramTextTraceLink obj) {
-        if (equals(obj))
-            return true;
-        return getDiagramElement().getBoundingBox().similar(globalConfiguration, obj.getDiagramElement().getBoundingBox()) && Objects.equals(getSentenceNo(),
-                obj.getSentenceNo());
-    }
-}
diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/models/tracelinks/diagrams/DiagramWordTraceLink.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/models/tracelinks/diagrams/DiagramWordTraceLink.java
deleted file mode 100644
index 52d3f15b1..000000000
--- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/models/tracelinks/diagrams/DiagramWordTraceLink.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/* Licensed under MIT 2023-2024. */
-package edu.kit.kastel.mcse.ardoco.core.api.models.tracelinks.diagrams;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.Objects;
-import java.util.TreeSet;
-import java.util.stream.Collectors;
-
-import edu.kit.kastel.mcse.ardoco.core.api.diagramrecognition.DiagramElement;
-import edu.kit.kastel.mcse.ardoco.core.api.text.Word;
-import edu.kit.kastel.mcse.ardoco.core.pipeline.agent.Claimant;
-
-/**
- * Represents a tracelink between a {@link DiagramElement} and a {@link Word}.
- */
-public class DiagramWordTraceLink extends DiagramTextTraceLink {
-    public static final Comparator<DiagramWordTraceLink> CONFIDENCE_COMPARATOR = Comparator.comparingDouble(DiagramWordTraceLink::getConfidence);
-
-    private final Word word;
-    private final double confidence;
-    private final Serializable origin;
-    private final TreeSet<DiagramWordTraceLink> relatedWordLinks = new TreeSet<>();
-    private final TreeSet<DiagramGoldStandardTraceLink> relatedGSLinks = new TreeSet<>();
-
-    /**
-     * Creates a tracelink between a diagram element and a sentence number of a word
-     *
-     * @param diagramElement diagram element
-     * @param word           word
-     * @param projectName    project name
-     * @param confidence     confidence
-     * @param origin         claimant this link was derived from
-     */
-    public DiagramWordTraceLink(DiagramElement diagramElement, Word word, String projectName, double confidence, Claimant origin) {
-        super(diagramElement, word.getSentence(), projectName);
-
-        this.word = word;
-        this.confidence = confidence;
-        this.origin = origin;
-    }
-
-    public Word getWord() {
-        return this.word;
-    }
-
-    public double getConfidence() {
-        return this.confidence;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        else if (obj instanceof DiagramWordTraceLink other) {
-            return Objects.equals(getDiagramElement(), other.getDiagramElement()) && getWord().getPosition() == other.getWord().getPosition() && Objects.equals(
-                    getConfidence(), other.getConfidence());
-        }
-        return super.equals(obj);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(getDiagramElement(), getWord(), getConfidence());
-    }
-
-    @Override
-    public int compareTo(DiagramTextTraceLink o) {
-        if (equals(o))
-            return 0;
-        var supComp = super.compareTo(o);
-        if (o instanceof DiagramWordTraceLink other && supComp == 0) {
-            var comp = Integer.compare(getWord().getPosition(), other.getWord().getPosition());
-            if (comp == 0) {
-                return Double.compare(getConfidence(), other.getConfidence());
-            }
-            return comp;
-        }
-        return supComp;
-    }
-
-    public void addRelated(Collection<? extends DiagramTextTraceLink> related) {
-        var list = new ArrayList<>(related);
-        for (var link : list) {
-            if (link == this)
-                continue;
-            if (link instanceof DiagramWordTraceLink wLink) {
-                relatedWordLinks.add(wLink);
-            } else if (link instanceof DiagramGoldStandardTraceLink gsLink) {
-                relatedGSLinks.add(gsLink);
-            }
-        }
-    }
-
-    public TreeSet<DiagramGoldStandardTraceLink> getRelatedGSLinks() {
-        return relatedGSLinks;
-    }
-
-    public TreeSet<DiagramWordTraceLink> getRelatedWordLinks() {
-        return relatedWordLinks;
-    }
-
-    @Override
-    public String toString() {
-        var relatedTypes = "";
-        if (!relatedGSLinks.isEmpty()) {
-            relatedTypes = relatedGSLinks.stream().map(g -> "[" + g.getTraceType().name() + "]").collect(Collectors.joining("-")) + "-";
-        }
-        return String.format("%s-[%s]-[%s]-[%.3f]-%s", super.toString(false), getWord().getText(), getWord().getPhrase().getText(), getConfidence(),
-                relatedTypes);
-    }
-}
diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/models/tracelinks/diagrams/TraceType.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/models/tracelinks/diagrams/TraceType.java
deleted file mode 100644
index e9e9fe439..000000000
--- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/models/tracelinks/diagrams/TraceType.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Licensed under MIT 2023-2024. */
-package edu.kit.kastel.mcse.ardoco.core.api.models.tracelinks.diagrams;
-
-import java.io.Serializable;
-
-/**
- * The {@link TraceType} refers to the type associated with a trace link. It can be used to annotate trace links in the gold standard with additional
- * information. Actual negatives can be marked using {@link #COMMON_NOUN}, {@link #SHARED_STEM} and {@link #OTHER_ENTITY}. The gold standard is not complete for
- * actual negatives, however the provided information can be used to determine potential causes of false positives.
- */
-public enum TraceType implements Serializable {
-    ENTITY(true),//Both endpoints point to the same entity
-    COMMON_NOUN(false),//Created due to a common noun usage (e.g. Entity "test" and word "test" in the text)
-    SHARED_STEM(false),//Created due to a shared word stem (e.g. Entity "testing" and word "testing" in the text)
-    ENTITY_COREFERENCE(true),//Both endpoints point to the same entity, but the textual endpoint is a coreference
-    OTHER_ENTITY(false),//Created due to another (similarly-named) entity
-    UNCERTAIN(false);//Marker for discussion
-
-    private final boolean actualPositive;
-
-    TraceType(boolean actualPositive) {
-        this.actualPositive = actualPositive;
-    }
-
-    /**
-     * {@return whether a trace link of this type is an actual positive}
-     */
-    public boolean isActualPositive() {
-        return this.actualPositive;
-    }
-}
diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/common/util/DataRepositoryHelper.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/common/util/DataRepositoryHelper.java
index e6dddde9f..be8ca61c3 100644
--- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/common/util/DataRepositoryHelper.java
+++ b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/common/util/DataRepositoryHelper.java
@@ -3,18 +3,15 @@
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
-import java.io.File;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
 
-import edu.kit.kastel.mcse.ardoco.core.api.InputDiagramData;
 import edu.kit.kastel.mcse.ardoco.core.api.InputTextData;
 import edu.kit.kastel.mcse.ardoco.core.api.PreprocessingData;
 import edu.kit.kastel.mcse.ardoco.core.api.codetraceability.CodeTraceabilityState;
 import edu.kit.kastel.mcse.ardoco.core.api.connectiongenerator.ConnectionStates;
-import edu.kit.kastel.mcse.ardoco.core.api.diagramrecognition.DiagramRecognitionState;
 import edu.kit.kastel.mcse.ardoco.core.api.inconsistency.InconsistencyStates;
 import edu.kit.kastel.mcse.ardoco.core.api.models.ModelStates;
 import edu.kit.kastel.mcse.ardoco.core.api.recommendationgenerator.RecommendationStates;
@@ -247,40 +244,6 @@ public static void putPreprocessingData(DataRepository dataRepository, Preproces
         dataRepository.addData(PreprocessingData.ID, preprocessingData);
     }
 
-    /**
-     * Checks whether there is {@link DiagramRecognitionState} stored within the provided {@link DataRepository}
-     *
-     * @param dataRepository the DataRepository to access
-     * @return true, if there is {@link DiagramRecognitionState} within the {@link DataRepository}; else, false
-     */
-    public static boolean hasDiagramRecognitionState(DataRepository dataRepository) {
-        return dataRepository.getData(DiagramRecognitionState.ID, DiagramRecognitionState.class).isPresent();
-    }
-
-    /**
-     * Returns the {@link DiagramRecognitionState} stored within the provided {@link DataRepository}. This does not check if there actually is one and will fail
-     * and throw an {@link java.util.NoSuchElementException} if the state is not present. To make sure that there is data present, use
-     * {@link #hasConnectionStates(DataRepository)}
-     *
-     * @param dataRepository the DataRepository to access
-     * @return the state
-     */
-    public static DiagramRecognitionState getDiagramRecognitionState(DataRepository dataRepository) {
-        return dataRepository.getData(DiagramRecognitionState.ID, DiagramRecognitionState.class).orElseThrow();
-    }
-
-    /**
-     * Save diagram directory as {@link InputDiagramData}.
-     *
-     * @param dataRepository   the data repository
-     * @param diagramDirectory the diagram directory
-     */
-    public static void putDiagramDirectory(DataRepository dataRepository, File diagramDirectory) {
-        InputDiagramData data = new InputDiagramData(diagramDirectory);
-        dataRepository.addData(InputDiagramData.ID, data);
-
-    }
-
     /**
      * {@return a deep copy of a serializable object using serialization}
      *