diff --git a/bin/log4jTesting.xml b/bin/log4jTesting.xml
deleted file mode 100755
index dc30c245..00000000
--- a/bin/log4jTesting.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<log4j:configuration xmlns:log4j='http://jakarta.apache.org/log4j/'>
-
- <appender name="CONSOLE" class="de.dhbwstuttgart.logger.ConsoleAppender">
-    <param name="Target" value="System.out"/>
-
-    <layout class="de.dhbwstuttgart.logger.PatternLayout">
-      <param name="ConversionPattern" value="%-15C{1} %-5p [%-9c] %m%n"/>
-    </layout>	    
- </appender>
-
- <logger name="trtest">
-       <level value="DEBUG"/>
-       <appender-ref ref="CONSOLE"/>
- </logger>
- 
-  <logger name="funcTest">
-       <level value="DEBUG"/>
-       <appender-ref ref="CONSOLE"/>
- </logger>
-
-</log4j:configuration>
diff --git a/bin/parser/BoundedParameter.jav b/bin/parser/BoundedParameter.jav
deleted file mode 100644
index 6d7518a9..00000000
--- a/bin/parser/BoundedParameter.jav
+++ /dev/null
@@ -1,3 +0,0 @@
-class Matrix{
-	<A extends B, C extends B> String op = "String";
-}
diff --git a/bin/parser/FieldInitializationTest.jav b/bin/parser/FieldInitializationTest.jav
deleted file mode 100644
index 302667b9..00000000
--- a/bin/parser/FieldInitializationTest.jav
+++ /dev/null
@@ -1,3 +0,0 @@
-class FieldInitializationTest{
-	String var = "hallo";
-}
\ No newline at end of file
diff --git a/bin/parser/GenericFieldVarTest.jav b/bin/parser/GenericFieldVarTest.jav
deleted file mode 100644
index a47b41eb..00000000
--- a/bin/parser/GenericFieldVarTest.jav
+++ /dev/null
@@ -1,3 +0,0 @@
-class Test{
-<A> A var;
-}
diff --git a/bin/parser/ImportTest.jav b/bin/parser/ImportTest.jav
deleted file mode 100644
index 2de55cee..00000000
--- a/bin/parser/ImportTest.jav
+++ /dev/null
@@ -1,4 +0,0 @@
-import java.util.*;
-
-class ImportTest{
-}
\ No newline at end of file
diff --git a/src/de/dhbwstuttgart/syntaxtree/Class.java b/src/de/dhbwstuttgart/syntaxtree/Class.java
index 3f83f2d5..7acfbfc0 100755
--- a/src/de/dhbwstuttgart/syntaxtree/Class.java
+++ b/src/de/dhbwstuttgart/syntaxtree/Class.java
@@ -59,8 +59,6 @@ import java.io.*;
  * Stellt jede Art von Klasse dar. Auch abstrakte Klassen und Interfaces
  */
 public class Class extends GTVDeclarationContext implements IItemWithOffset, Generic, GenericTypeInsertable
-// ino.end
-// ino.class.Class.23010.body
 {
     /**
      * Log4j - Loggerinstanzen
diff --git a/src/de/dhbwstuttgart/syntaxtree/ClassHelper.java b/src/de/dhbwstuttgart/syntaxtree/ClassHelper.java
deleted file mode 100755
index ec7c20b1..00000000
--- a/src/de/dhbwstuttgart/syntaxtree/ClassHelper.java
+++ /dev/null
@@ -1,59 +0,0 @@
-// ino.module.ClassHelper.8555.package 
-package de.dhbwstuttgart.syntaxtree;
-// ino.end
-
-// ino.module.ClassHelper.8555.import 
-import de.dhbwstuttgart.typeinference.Menge;
-
-import de.dhbwstuttgart.syntaxtree.type.GenericTypeVar;
-import de.dhbwstuttgart.syntaxtree.type.RefType;
-import de.dhbwstuttgart.syntaxtree.type.Type;
-
-// ino.class.ClassHelper.23206.declaration 
-public class ClassHelper
-// ino.end
-// ino.class.ClassHelper.23206.body
-{
-    // ino.method.findGenericType.23209.defdescription type=javadoc
-    /**
-     * HOTI
-     * Diese Methode sucht in der Klassendefinition nach einen GTV, die
-     * so heißt wie die im RefType definierte Variable. Wenn sie diese gefunden
-     * hat, wird sie zurückgeben. Wenn dies nicht der Fall war, schaut sie, falls      
-     * angegeben in den Methodenparametern nach. Findet sie dort auch nichts, liefert  
-     * die Methode <b>null</b>. 
-     * @param type
-     * @return
-     */
-    // ino.end
-    // ino.method.findGenericType.23209.definition 
-	@Deprecated
-    public static GenericTypeVar findGenericType(Type type, Menge<Type> paralist, Menge<GenericTypeVar> methodParaList)
-    // ino.end
-    // ino.method.findGenericType.23209.body 
-    {
-        if(!(type instanceof RefType)){
-            return null;
-        }
-        for(int i=0;i<paralist.size();i++){
-            if(paralist.get(i) instanceof GenericTypeVar){
-                GenericTypeVar gtv=(GenericTypeVar)paralist.get(i);
-                if(gtv.getName().equals(type.getName())){
-                    return gtv;
-                }
-            }
-        }
-        if(methodParaList!=null){
-            for(int i=0;i<methodParaList.size();i++){
-                GenericTypeVar gtv=methodParaList.elementAt(i);
-                if(gtv.getName().equals(type.getName())){
-                    return gtv;
-                }
-            }
-        }
-        return(null);
-    }
-    // ino.end
-
-}
-// ino.end
diff --git a/src/de/dhbwstuttgart/syntaxtree/Constructor.java b/src/de/dhbwstuttgart/syntaxtree/Constructor.java
index 457dc35e..f496cff3 100644
--- a/src/de/dhbwstuttgart/syntaxtree/Constructor.java
+++ b/src/de/dhbwstuttgart/syntaxtree/Constructor.java
@@ -65,15 +65,9 @@ public class Constructor extends Method {
 		DHBWConstantPoolGen _cp = cg.getConstantPool();
 		InstructionList il = new InstructionList(); //sollte nicht new sein sondern aus Block kommen
 		
-<<<<<<< HEAD
 		MethodGenerator method = new MethodGenerator(Constants.ACC_PUBLIC, this.getType().getBytecodeType(cg, null),
 				this.parameterlist.getBytecodeTypeList(cg,null) , this.parameterlist.getParameterNameArray(),
 				"<init>", cg.getClassName(), il, _cp);
-=======
-		MethodGenerator method = new MethodGenerator(Constants.ACC_PUBLIC, 
-				this.getType().getBytecodeType(cg, null),  this.parameterlist.getBytecodeTypeList(cg,null),
-				this.parameterlist.getParameterNameArray(), "<init>", parentClass.name.toString(), il, _cp);
->>>>>>> refactoring
 		
 		//FieldInitializations an Block anfügen
 		Block block = this.get_Block();