diff --git a/AlgebraicDataflowArchitectureModel/src/algorithms/DataStorageDecision.java b/AlgebraicDataflowArchitectureModel/src/algorithms/DataStorageDecision.java
index 1973d6d..a1ea1cf 100644
--- a/AlgebraicDataflowArchitectureModel/src/algorithms/DataStorageDecision.java
+++ b/AlgebraicDataflowArchitectureModel/src/algorithms/DataStorageDecision.java
@@ -3,9 +3,7 @@
 import java.util.HashSet;
 
 import models.*;
-import models.algebra.Position;
-import models.algebra.Term;
-import models.algebra.Variable;
+import models.algebra.*;
 import models.dataConstraintModel.ChannelMember;
 import models.dataConstraintModel.DataConstraintModel;
 import models.dataFlowModel.*;
diff --git a/AlgebraicDataflowArchitectureModel/src/algorithms/UpdateConflictCheck.java b/AlgebraicDataflowArchitectureModel/src/algorithms/UpdateConflictCheck.java
index a2e7dc8..f1689ff 100644
--- a/AlgebraicDataflowArchitectureModel/src/algorithms/UpdateConflictCheck.java
+++ b/AlgebraicDataflowArchitectureModel/src/algorithms/UpdateConflictCheck.java
@@ -3,7 +3,6 @@
 import java.util.*;
 
 import models.*;
-import models.dataConstraintModel.*;
 import models.dataFlowModel.*;
 
 public class UpdateConflictCheck {
diff --git a/AlgebraicDataflowArchitectureModel/src/tests/CodeGeneratorTest.java b/AlgebraicDataflowArchitectureModel/src/tests/CodeGeneratorTest.java
index ef8b671..a0906f5 100644
--- a/AlgebraicDataflowArchitectureModel/src/tests/CodeGeneratorTest.java
+++ b/AlgebraicDataflowArchitectureModel/src/tests/CodeGeneratorTest.java
@@ -7,8 +7,6 @@
 import java.util.ArrayList;
 
 import algorithms.*;
-import code.ast.FieldDeclaration;
-import code.ast.MethodDeclaration;
 import code.ast.TypeDeclaration;
 import models.dataFlowModel.*;
 import parser.*;
diff --git a/AlgebraicDataflowArchitectureModel/src/tests/ParseTest.java b/AlgebraicDataflowArchitectureModel/src/tests/ParseTest.java
index 864e816..04ad162 100644
--- a/AlgebraicDataflowArchitectureModel/src/tests/ParseTest.java
+++ b/AlgebraicDataflowArchitectureModel/src/tests/ParseTest.java
@@ -1,7 +1,5 @@
 package tests;
 
-import static org.junit.Assert.assertEquals;
-
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -14,11 +12,7 @@
 import models.algebra.ValueUndefined;
 import models.dataConstraintModel.ChannelGenerator;
 import models.dataConstraintModel.ChannelMember;
-import models.dataFlowModel.DataFlowModel;
-import models.dataFlowModel.DataflowChannelGenerator;
-import models.dataFlowModel.ResolvingMultipleDefinitionIsFutureWork;
-import models.dataFlowModel.ResourceDependencyGraph;
-import models.dataFlowModel.ResourceNode;
+import models.dataFlowModel.*;
 import parser.ExpectedChannel;
 import parser.ExpectedChannelName;
 import parser.ExpectedEquals;
diff --git a/AlgebraicDataflowArchitectureModel/src/tests/UpdateCodeGenerationTest.java b/AlgebraicDataflowArchitectureModel/src/tests/UpdateCodeGenerationTest.java
index 902d01f..870769f 100644
--- a/AlgebraicDataflowArchitectureModel/src/tests/UpdateCodeGenerationTest.java
+++ b/AlgebraicDataflowArchitectureModel/src/tests/UpdateCodeGenerationTest.java
@@ -1,9 +1,5 @@
 package tests;
 
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
 import models.algebra.Constant;
 import models.algebra.Expression;
 import models.algebra.Field;
@@ -15,12 +11,7 @@
 import models.algebra.UnificationFailed;
 import models.algebra.ValueUndefined;
 import models.algebra.Variable;
-import models.dataConstraintModel.ChannelMember;
-import models.dataConstraintModel.ChannelSelector;
-import models.dataConstraintModel.DataConstraintModel;
-import models.dataConstraintModel.GroupSelector;
-import models.dataConstraintModel.IdentifierTemplate;
-import models.dataConstraintModel.StateTransition;
+import models.dataConstraintModel.*;
 import models.dataFlowModel.DataFlowModel;
 import models.dataFlowModel.DataflowChannelGenerator;
 import models.dataFlowModel.DataflowChannelGenerator.IResourceStateAccessor;