diff --git a/app/src/main/java/de/sebse/fuplanner/fragments/ScheduleFragment.java b/app/src/main/java/de/sebse/fuplanner/fragments/ScheduleFragment.java
index 6028141..648b45e 100644
--- a/app/src/main/java/de/sebse/fuplanner/fragments/ScheduleFragment.java
+++ b/app/src/main/java/de/sebse/fuplanner/fragments/ScheduleFragment.java
@@ -14,12 +14,8 @@ import com.alamkanak.weekview.MonthLoader;
 import com.alamkanak.weekview.WeekView;
 import com.alamkanak.weekview.WeekViewEvent;
 
-import java.time.LocalDate;
-import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.Calendar;
-import java.util.Date;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 
@@ -29,9 +25,6 @@ import de.sebse.fuplanner.services.KVV.KVV;
 import de.sebse.fuplanner.services.KVV.types.Event;
 import de.sebse.fuplanner.services.KVV.types.Modules;
 import de.sebse.fuplanner.tools.logging.Logger;
-import de.sebse.fuplanner.tools.network.NetworkCallback;
-import de.sebse.fuplanner.tools.network.NetworkError;
-import de.sebse.fuplanner.tools.network.NetworkErrorCallback;
 
 /**
  * A simple {@link Fragment} subclass.
diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/KVV.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/KVV.java
index c484196..4ac3eaf 100644
--- a/app/src/main/java/de/sebse/fuplanner/services/KVV/KVV.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/KVV.java
@@ -1,6 +1,5 @@
 package de.sebse.fuplanner.services.KVV;
 
-import android.arch.core.util.Function;
 import android.content.Context;
 import android.support.annotation.NonNull;
 import android.util.Pair;
diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/types/Assignment.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/types/Assignment.java
index 7203516..b7f1d3b 100644
--- a/app/src/main/java/de/sebse/fuplanner/services/KVV/types/Assignment.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/types/Assignment.java
@@ -1,9 +1,7 @@
 package de.sebse.fuplanner.services.KVV.types;
 
 import java.io.Serializable;
-import java.lang.reflect.Array;
 import java.util.ArrayList;
-import java.util.Date;
 
 public class Assignment implements Serializable {
     private final String id;
diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/types/Event.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/types/Event.java
index 727dec4..0a0d07f 100644
--- a/app/src/main/java/de/sebse/fuplanner/services/KVV/types/Event.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/types/Event.java
@@ -1,7 +1,6 @@
 package de.sebse.fuplanner.services.KVV.types;
 
 import java.io.Serializable;
-import java.util.Date;
 
 public class Event implements Serializable {
     private final String id;
diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/types/LoginToken.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/types/LoginToken.java
index d69a654..fcb6e32 100644
--- a/app/src/main/java/de/sebse/fuplanner/services/KVV/types/LoginToken.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/types/LoginToken.java
@@ -1,6 +1,5 @@
 package de.sebse.fuplanner.services.KVV.types;
 
-import java.io.Serializable;
 import java.util.HashMap;
 
 /**
diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/types/Modules.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/types/Modules.java
index baf3f64..42b8e51 100644
--- a/app/src/main/java/de/sebse/fuplanner/services/KVV/types/Modules.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/types/Modules.java
@@ -2,10 +2,8 @@ package de.sebse.fuplanner.services.KVV.types;
 
 import android.content.Context;
 import android.support.annotation.NonNull;
-import android.support.v7.util.SortedList;
 
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.ObjectInputStream;
diff --git a/app/src/main/java/de/sebse/fuplanner/tools/SortedModuleList.java b/app/src/main/java/de/sebse/fuplanner/tools/SortedModuleList.java
index 8f5d4bf..35b0e68 100644
--- a/app/src/main/java/de/sebse/fuplanner/tools/SortedModuleList.java
+++ b/app/src/main/java/de/sebse/fuplanner/tools/SortedModuleList.java
@@ -4,7 +4,6 @@ import java.io.Serializable;
 import java.util.AbstractList;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Comparator;
 
 import de.sebse.fuplanner.services.KVV.types.Modules;