diff --git a/src/main/java/de/tobias/playpad/server/sql/ColumnName.java b/src/main/java/de/tobias/playpad/server/sql/ColumnName.java
deleted file mode 100644
index 733f758c76fd31b48fbe6c33ab60a6bbdefd6999..0000000000000000000000000000000000000000
--- a/src/main/java/de/tobias/playpad/server/sql/ColumnName.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package de.tobias.playpad.server.sql;
-
-import java.lang.annotation.*;
-
-@Target(ElementType.FIELD)
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-public @interface ColumnName
-{
-	/**
-	 * Name of the table column.
-	 *
-	 * @return name
-	 */
-	String value();
-
-	Class<? extends SqlResultHandler> handler() default StringSqlResultHandler.class;
-
-}
diff --git a/src/main/java/de/tobias/playpad/server/sql/ForeignKey.java b/src/main/java/de/tobias/playpad/server/sql/ForeignKey.java
deleted file mode 100644
index 2cddd2cc44c9fa0829351925cc94825f2fb9a18e..0000000000000000000000000000000000000000
--- a/src/main/java/de/tobias/playpad/server/sql/ForeignKey.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package de.tobias.playpad.server.sql;
-
-import java.lang.annotation.*;
-
-@Target(ElementType.FIELD)
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-public @interface ForeignKey
-{
-}
diff --git a/src/main/java/de/tobias/playpad/server/sql/Id.java b/src/main/java/de/tobias/playpad/server/sql/Id.java
deleted file mode 100644
index 657f21485adf443b845e2db229cf228a87fe79e7..0000000000000000000000000000000000000000
--- a/src/main/java/de/tobias/playpad/server/sql/Id.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package de.tobias.playpad.server.sql;
-
-import java.lang.annotation.*;
-
-@Target(ElementType.FIELD)
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-public @interface Id
-{
-}
diff --git a/src/main/java/de/tobias/playpad/server/sql/Table.java b/src/main/java/de/tobias/playpad/server/sql/Table.java
deleted file mode 100644
index 4430b4b97eb69ff741cd17e4c8f488bd82f79df1..0000000000000000000000000000000000000000
--- a/src/main/java/de/tobias/playpad/server/sql/Table.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package de.tobias.playpad.server.sql;
-
-import java.lang.annotation.*;
-
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-public @interface Table
-{
-	String value();
-}
diff --git a/src/main/scala/de/tobias/playpad/server/project/Pad.scala b/src/main/scala/de/tobias/playpad/server/project/Pad.scala
index 555bacb059a33f9562e96602c13923668a72f63c..eb83840f8fa87cef7943f1bda100f249e38f2615 100644
--- a/src/main/scala/de/tobias/playpad/server/project/Pad.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/Pad.scala
@@ -4,28 +4,21 @@ import java.util.UUID
 
 import de.tobias.playpad.server.json._
 import de.tobias.playpad.server.project.settings.PadSettings
-import de.tobias.playpad.server.sql.{ColumnName, ForeignKey, Id, Table}
 
 /**
  * Created by tobias on 17.02.17.
  */
-@Table("Pad")
 class Pad() {
 
 	@JsonName(value = "id", handler = classOf[UUIDSerializerHandler])
-	@Id
-	@ColumnName("id")
 	var id: UUID = UUID.randomUUID()
 
 	@JsonName("name")
-	@ColumnName("name")
 	var name: String = _
 	@JsonName(value = "position", handler = classOf[IntSerializerHandler])
-	@ColumnName("position")
 	var position: Int = _
 
 	@JsonName("contentType")
-	@ColumnName("content_type")
 	var contentType: String = _
 	@JsonCollection(value = "paths", `type` = classOf[Path])
 	var paths: List[Path] = List()
@@ -34,7 +27,6 @@ class Pad() {
 	var padSettings: PadSettings = _
 
 	@JsonParent
-	@ForeignKey
 	var page: Page = _
 
 
diff --git a/src/main/scala/de/tobias/playpad/server/project/loader/sql/PadLoader.scala b/src/main/scala/de/tobias/playpad/server/project/loader/sql/PadLoader.scala
index c4318534056bba6874331cd8cf71b6e880c82236..4976e6ac7408452ae231af746e0fa3631a83880f 100644
--- a/src/main/scala/de/tobias/playpad/server/project/loader/sql/PadLoader.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/loader/sql/PadLoader.scala
@@ -5,7 +5,6 @@ import java.util.UUID
 
 import de.tobias.playpad.server.project.utils.SqlDef._
 import de.tobias.playpad.server.project.{Pad, Page}
-import de.tobias.playpad.server.sql.SqlSerializer
 
 /**
  * Created by tobias on 17.02.17.
@@ -19,10 +18,6 @@ class PadLoader(val connection: Connection) {
 
 		var pads: List[Pad] = List()
 
-
-		val padss = new SqlSerializer().queryObj(classOf[Pad], connection)
-		println(padss)
-
 		while (result.next()) {
 			val pad = new Pad()
 			pad.id = UUID.fromString(result.getString(PAD_ID))
diff --git a/src/main/scala/de/tobias/playpad/server/sql/SqlResultHandler.scala b/src/main/scala/de/tobias/playpad/server/sql/SqlResultHandler.scala
deleted file mode 100644
index 329c632e7f545ba6f4e543f0d76fb6b3fd63f68e..0000000000000000000000000000000000000000
--- a/src/main/scala/de/tobias/playpad/server/sql/SqlResultHandler.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-package de.tobias.playpad.server.sql
-
-trait SqlResultHandler {
-
-	def fromResult(o: Any): Any
-
-	def toQuery(o: Any): Any
-}
diff --git a/src/main/scala/de/tobias/playpad/server/sql/SqlSerializer.scala b/src/main/scala/de/tobias/playpad/server/sql/SqlSerializer.scala
deleted file mode 100644
index f8f19832bf0c09e81f096513314a899971f5ba9a..0000000000000000000000000000000000000000
--- a/src/main/scala/de/tobias/playpad/server/sql/SqlSerializer.scala
+++ /dev/null
@@ -1,107 +0,0 @@
-package de.tobias.playpad.server.sql
-
-import java.sql.{Connection, ResultSet}
-import java.util.UUID
-
-class SqlSerializer {
-
-	def queryObj[T](clazz: Class[T], key: UUID, connection: Connection, keyName: String = null): T = {
-		val obj = clazz.newInstance()
-		if (clazz.isAnnotationPresent(classOf[Table])) {
-			val table = clazz.getAnnotation(classOf[Table]).value()
-
-			val columnName = if (keyName != null) {
-				keyName
-			} else {
-				getKeyName(clazz)
-			}
-
-			val stmt = connection.prepareStatement(s"SELECT * FROM $table WHERE $columnName = ?")
-			stmt.setString(1, key.toString)
-			val result = stmt.executeQuery()
-
-			if (result.first()) {
-				clazz.getDeclaredFields
-					.filter(f => f.isAnnotationPresent(classOf[ColumnName]))
-					.foreach(f => {
-						f.setAccessible(true)
-						f.set(obj, result.getObject(f.getAnnotation(classOf[ColumnName]).value()))
-					})
-			}
-
-			result.close()
-			stmt.close()
-		}
-		obj
-	}
-
-	private def getKeyName[T](clazz: Class[T]): String = {
-		val field = clazz.getDeclaredFields
-			.filter(f => f.isAnnotationPresent(classOf[ColumnName]))
-			.find(f => f.isAnnotationPresent(classOf[Id]))
-
-		if (field.isDefined) {
-			field.get.getAnnotation(classOf[ColumnName]).value()
-		} else {
-			null
-		}
-	}
-
-	//	def queryObj[T](clazz: Class[T], key: UUID, connection: Connection, keyName: String): List[T] = {
-	//		if (clazz.isAnnotationPresent(classOf[Table])) {
-	//			val table = clazz.getAnnotation(classOf[Table]).value()
-	//
-	//			val stmt = connection.prepareStatement(s"SELECT * FROM $table WHERE $keyName = ?")
-	//			stmt.setString(1, key.toString)
-	//			val result = stmt.executeQuery()
-	//
-	//			val list = getResult(clazz, result)
-	//
-	//			result.close()
-	//			stmt.close()
-	//			list
-	//		} else {
-	//			null
-	//		}
-	//	}
-
-	def queryObj[T](clazz: Class[T], connection: Connection): List[T] = {
-		if (clazz.isAnnotationPresent(classOf[Table])) {
-			val table = clazz.getAnnotation(classOf[Table]).value()
-
-			val stmt = connection.prepareStatement(s"SELECT * FROM $table")
-			val result = stmt.executeQuery()
-
-			val list = getResult(clazz, result)
-
-			result.close()
-			stmt.close()
-			list
-		} else {
-			null
-		}
-	}
-
-	private def getResult[T](clazz: Class[T], result: ResultSet): List[T] = {
-		var list = List[T]()
-		while (result.next()) {
-			val obj = clazz.newInstance()
-			clazz.getDeclaredFields
-				.filter(f => f.isAnnotationPresent(classOf[ColumnName]))
-				.foreach(f => {
-					f.setAccessible(true)
-
-					if (f.getType.equals(classOf[UUID])) {
-						f.set(obj, UUID.fromString(result.getString(f.getAnnotation(classOf[ColumnName]).value())))
-					} else {
-						val column = f.getAnnotation(classOf[ColumnName])
-						val columnName = column.value()
-						f.set(obj, column.handler().newInstance().fromResult(result.getObject(columnName)))
-					}
-
-				})
-			list = obj :: list
-		}
-		list
-	}
-}
diff --git a/src/main/scala/de/tobias/playpad/server/sql/StringSqlResultHandler.scala b/src/main/scala/de/tobias/playpad/server/sql/StringSqlResultHandler.scala
deleted file mode 100644
index 8912cef391c9d4ab10cdd6ba69b5b89a0593b089..0000000000000000000000000000000000000000
--- a/src/main/scala/de/tobias/playpad/server/sql/StringSqlResultHandler.scala
+++ /dev/null
@@ -1,7 +0,0 @@
-package de.tobias.playpad.server.sql
-
-class StringSqlResultHandler extends SqlResultHandler {
-	override def fromResult(o: Any): Any = o
-
-	override def toQuery(o: Any): Any = o
-}
diff --git a/src/main/scala/de/tobias/playpad/server/sql/UUIDSqlResultHandler.scala b/src/main/scala/de/tobias/playpad/server/sql/UUIDSqlResultHandler.scala
deleted file mode 100644
index f77c90de02ec03c6cc27c9a71fc793ce00cf28f7..0000000000000000000000000000000000000000
--- a/src/main/scala/de/tobias/playpad/server/sql/UUIDSqlResultHandler.scala
+++ /dev/null
@@ -1,19 +0,0 @@
-package de.tobias.playpad.server.sql
-
-import java.util.UUID
-
-class UUIDSqlResultHandler extends SqlResultHandler {
-	override def fromResult(o: Any): Any = {
-		o match {
-			case string: String => UUID.fromString(string)
-			case _ => null
-		}
-	}
-
-	override def toQuery(o: Any): Any = {
-		o match {
-			case uuid: UUID => uuid.toString
-			case _ => null
-		}
-	}
-}