diff --git a/src/main/java/de/hitec/nhplus/datastorage/ConnectionBuilder.java b/src/main/java/de/hitec/nhplus/datastorage/ConnectionBuilder.java
index 82cea08..3b1bcf2 100644
--- a/src/main/java/de/hitec/nhplus/datastorage/ConnectionBuilder.java
+++ b/src/main/java/de/hitec/nhplus/datastorage/ConnectionBuilder.java
@@ -21,7 +21,6 @@ public class ConnectionBuilder {
 
     /**
      * @return a Thread-safe {@link Connection} to the Database.
-     * @author Bernd Heidemann
      */
     synchronized public static Connection getConnection() {
         try {
@@ -39,8 +38,6 @@ public class ConnectionBuilder {
 
     /**
      * Closes the Connection to the Database.
-     *
-     * @author Bernd Heidemann
      */
     synchronized public static void closeConnection() {
         try {
diff --git a/src/main/java/de/hitec/nhplus/datastorage/Dao.java b/src/main/java/de/hitec/nhplus/datastorage/Dao.java
index 0a38d48..477faf5 100644
--- a/src/main/java/de/hitec/nhplus/datastorage/Dao.java
+++ b/src/main/java/de/hitec/nhplus/datastorage/Dao.java
@@ -17,7 +17,6 @@ public interface Dao<T> {
      * Create a Database Entry from a Model object.
      *
      * @param t the Model instance
-     * @author Bernd Heidemann
      */
     void create(T t) throws SQLException;
 
@@ -25,14 +24,11 @@ public interface Dao<T> {
      * Read a Database Entry to a Model object.
      *
      * @param id of the Element in the Database
-     * @author Bernd Heidemann
      */
     T read(int id) throws SQLException;
 
     /**
      * Read all Database Entries to a {@link List} of Model objects.
-     *
-     * @author Bernd Heidemann
      */
     List<T> readAll() throws SQLException;
 
@@ -40,7 +36,6 @@ public interface Dao<T> {
      * Update the Database according to the Values of the Model object.
      *
      * @param t the Model instance.
-     * @author Bernd Heidemann
      */
     void update(T t) throws SQLException;
 
@@ -48,7 +43,6 @@ public interface Dao<T> {
      * Delete a Database Entry.
      *
      * @param id of the Element in the Database.
-     * @author Bernd Heidemann
      */
     void delete(int id) throws SQLException;
 }
diff --git a/src/main/java/de/hitec/nhplus/datastorage/DaoFactory.java b/src/main/java/de/hitec/nhplus/datastorage/DaoFactory.java
index ea4ccbe..5fcebc7 100644
--- a/src/main/java/de/hitec/nhplus/datastorage/DaoFactory.java
+++ b/src/main/java/de/hitec/nhplus/datastorage/DaoFactory.java
@@ -17,15 +17,12 @@ public class DaoFactory {
 
     /**
      * A Private Constructor according to the Singleton Pattern.
-     *
-     * @author Bernd Heidemann
      */
     private DaoFactory() {
     }
 
     /**
      * @return {@link DaoFactory}, the Singleton Instance
-     * @author Bernd Heidemann
      */
     public static DaoFactory getInstance() {
         if (DaoFactory.instance == null) {
@@ -36,7 +33,6 @@ public class DaoFactory {
 
     /**
      * @return a {@link TreatmentDao}
-     * @author Bernd Heidemann
      */
     public TreatmentDao createTreatmentDao() {
         return new TreatmentDao(ConnectionBuilder.getConnection());
@@ -44,7 +40,6 @@ public class DaoFactory {
 
     /**
      * @return a {@link PatientDao}
-     * @author Bernd Heidemann
      */
     public PatientDao createPatientDAO() {
         return new PatientDao(ConnectionBuilder.getConnection());
@@ -52,7 +47,6 @@ public class DaoFactory {
 
     /**
      * @return a {@link NurseDao}
-     * @author Dominik Säume
      */
     public NurseDao createNurseDAO() {
         return new NurseDao(ConnectionBuilder.getConnection());
@@ -60,7 +54,6 @@ public class DaoFactory {
 
     /**
      * @return a {@link MedicationDao}
-     * @author Dominik Säume
      */
     public MedicationDao createMedicationDAO() {
         return new MedicationDao(ConnectionBuilder.getConnection());
diff --git a/src/main/java/de/hitec/nhplus/medication/database/MedicationDao.java b/src/main/java/de/hitec/nhplus/medication/database/MedicationDao.java
index ca9747a..3eaac72 100644
--- a/src/main/java/de/hitec/nhplus/medication/database/MedicationDao.java
+++ b/src/main/java/de/hitec/nhplus/medication/database/MedicationDao.java
@@ -3,9 +3,6 @@ package de.hitec.nhplus.medication.database;
 import de.hitec.nhplus.datastorage.Dao;
 import de.hitec.nhplus.medication.Ingredient;
 import de.hitec.nhplus.medication.Medication;
-
-import javax.sql.rowset.CachedRowSet;
-import javax.sql.rowset.RowSetProvider;
 import java.sql.*;
 import java.util.ArrayList;
 import java.util.HashMap;