diff --git a/src/org/fdroid/fdroid/AppFilter.java b/src/org/fdroid/fdroid/AppFilter.java
index 24f723d70..29d0731fe 100644
--- a/src/org/fdroid/fdroid/AppFilter.java
+++ b/src/org/fdroid/fdroid/AppFilter.java
@@ -18,9 +18,6 @@
 
 package org.fdroid.fdroid;
 
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.preference.PreferenceManager;
 import org.fdroid.fdroid.data.App;
 
 public class AppFilter {
diff --git a/src/org/fdroid/fdroid/Preferences.java b/src/org/fdroid/fdroid/Preferences.java
index 47eebdc72..4b984deeb 100644
--- a/src/org/fdroid/fdroid/Preferences.java
+++ b/src/org/fdroid/fdroid/Preferences.java
@@ -2,7 +2,6 @@ package org.fdroid.fdroid;
 
 import java.util.*;
 
-import android.app.LoaderManager;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
diff --git a/src/org/fdroid/fdroid/Utils.java b/src/org/fdroid/fdroid/Utils.java
index 97f4e4a92..6f2950aac 100644
--- a/src/org/fdroid/fdroid/Utils.java
+++ b/src/org/fdroid/fdroid/Utils.java
@@ -26,7 +26,6 @@ import android.util.DisplayMetrics;
 import android.util.Log;
 import com.nostra13.universalimageloader.utils.StorageUtils;
 
-import java.io.BufferedReader;
 import java.io.Closeable;
 import java.io.File;
 import java.io.FileReader;
@@ -39,8 +38,6 @@ import java.text.SimpleDateFormat;
 import java.security.MessageDigest;
 import java.util.*;
 
-import org.fdroid.fdroid.data.Repo;
-
 public final class Utils {
 
     public static final int BUFFER_SIZE = 4096;
diff --git a/src/org/fdroid/fdroid/compat/ClipboardCompat.java b/src/org/fdroid/fdroid/compat/ClipboardCompat.java
index 8e4c49cbc..11a8a7786 100644
--- a/src/org/fdroid/fdroid/compat/ClipboardCompat.java
+++ b/src/org/fdroid/fdroid/compat/ClipboardCompat.java
@@ -4,10 +4,6 @@ import android.annotation.TargetApi;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
-import android.widget.CompoundButton;
-import android.widget.Switch;
-import android.widget.ToggleButton;
-import org.fdroid.fdroid.ManageRepo;
 
 public abstract class ClipboardCompat extends Compatibility {
 
diff --git a/src/org/fdroid/fdroid/compat/SupportedArchitectures.java b/src/org/fdroid/fdroid/compat/SupportedArchitectures.java
index b28708d5a..cc88a534b 100644
--- a/src/org/fdroid/fdroid/compat/SupportedArchitectures.java
+++ b/src/org/fdroid/fdroid/compat/SupportedArchitectures.java
@@ -4,7 +4,6 @@ import java.util.Set;
 import java.util.HashSet;
 
 import android.annotation.TargetApi;
-import android.util.Log;
 import android.os.Build;
 
 public class SupportedArchitectures extends Compatibility {
diff --git a/src/org/fdroid/fdroid/compat/SwitchCompat.java b/src/org/fdroid/fdroid/compat/SwitchCompat.java
index b5cbb7815..3177fe601 100644
--- a/src/org/fdroid/fdroid/compat/SwitchCompat.java
+++ b/src/org/fdroid/fdroid/compat/SwitchCompat.java
@@ -2,7 +2,6 @@ package org.fdroid.fdroid.compat;
 
 import android.annotation.TargetApi;
 import android.content.Context;
-import android.os.Build;
 import android.widget.CompoundButton;
 import android.widget.Switch;
 import android.widget.ToggleButton;
diff --git a/src/org/fdroid/fdroid/data/DBHelper.java b/src/org/fdroid/fdroid/data/DBHelper.java
index db273fa29..3696b5f91 100644
--- a/src/org/fdroid/fdroid/data/DBHelper.java
+++ b/src/org/fdroid/fdroid/data/DBHelper.java
@@ -2,11 +2,9 @@ package org.fdroid.fdroid.data;
 
 import android.content.ContentValues;
 import android.content.Context;
-import android.content.SharedPreferences;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
-import android.preference.PreferenceManager;
 import android.util.Log;
 import org.fdroid.fdroid.*;
 
diff --git a/src/org/fdroid/fdroid/views/AppListAdapter.java b/src/org/fdroid/fdroid/views/AppListAdapter.java
index 3665ec53e..5659283fd 100644
--- a/src/org/fdroid/fdroid/views/AppListAdapter.java
+++ b/src/org/fdroid/fdroid/views/AppListAdapter.java
@@ -5,7 +5,6 @@ import android.content.pm.PackageInfo;
 import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.support.v4.widget.CursorAdapter;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/src/org/fdroid/fdroid/views/fragments/AppListFragment.java b/src/org/fdroid/fdroid/views/fragments/AppListFragment.java
index 523c271e7..3ad2c08a3 100644
--- a/src/org/fdroid/fdroid/views/fragments/AppListFragment.java
+++ b/src/org/fdroid/fdroid/views/fragments/AppListFragment.java
@@ -1,23 +1,18 @@
 package org.fdroid.fdroid.views.fragments;
 
-import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
-import android.preference.PreferenceManager;
 import android.support.v4.app.ListFragment;
 import android.support.v4.app.LoaderManager;
 import android.support.v4.content.CursorLoader;
 import android.support.v4.content.Loader;
 import android.util.Log;
 import android.view.View;
-import android.view.ViewGroup;
 import android.widget.AdapterView;
-import android.widget.ListView;
-
 
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.nostra13.universalimageloader.core.listener.PauseOnScrollListener;
diff --git a/src/org/fdroid/fdroid/views/fragments/CanUpdateAppsFragment.java b/src/org/fdroid/fdroid/views/fragments/CanUpdateAppsFragment.java
index 0241b3657..d42cbd6c2 100644
--- a/src/org/fdroid/fdroid/views/fragments/CanUpdateAppsFragment.java
+++ b/src/org/fdroid/fdroid/views/fragments/CanUpdateAppsFragment.java
@@ -1,10 +1,6 @@
 package org.fdroid.fdroid.views.fragments;
 
-import android.database.Cursor;
 import android.net.Uri;
-import android.os.Bundle;
-import android.support.v4.content.CursorLoader;
-import android.support.v4.content.Loader;
 import org.fdroid.fdroid.R;
 import org.fdroid.fdroid.data.AppProvider;
 import org.fdroid.fdroid.views.AppListAdapter;
diff --git a/src/org/fdroid/fdroid/views/fragments/InstalledAppsFragment.java b/src/org/fdroid/fdroid/views/fragments/InstalledAppsFragment.java
index dbcdf5cbb..8585786b0 100644
--- a/src/org/fdroid/fdroid/views/fragments/InstalledAppsFragment.java
+++ b/src/org/fdroid/fdroid/views/fragments/InstalledAppsFragment.java
@@ -1,10 +1,6 @@
 package org.fdroid.fdroid.views.fragments;
 
-import android.database.Cursor;
 import android.net.Uri;
-import android.os.Bundle;
-import android.support.v4.content.CursorLoader;
-import android.support.v4.content.Loader;
 import org.fdroid.fdroid.R;
 import org.fdroid.fdroid.data.AppProvider;
 import org.fdroid.fdroid.views.AppListAdapter;
diff --git a/test/src/org/fdroid/fdroid/ApkProviderTest.java b/test/src/org/fdroid/fdroid/ApkProviderTest.java
index 4c808a066..6c065c814 100644
--- a/test/src/org/fdroid/fdroid/ApkProviderTest.java
+++ b/test/src/org/fdroid/fdroid/ApkProviderTest.java
@@ -3,9 +3,9 @@ package org.fdroid.fdroid;
 import android.content.ContentValues;
 import android.database.Cursor;
 import android.net.Uri;
+
 import org.fdroid.fdroid.data.Apk;
 import org.fdroid.fdroid.data.ApkProvider;
-import org.fdroid.fdroid.data.AppProvider;
 import org.fdroid.fdroid.data.RepoProvider;
 import org.fdroid.fdroid.mock.MockApk;
 import org.fdroid.fdroid.mock.MockApp;
diff --git a/test/src/org/fdroid/fdroid/AppProviderTest.java b/test/src/org/fdroid/fdroid/AppProviderTest.java
index 9c1c696a0..6b801869d 100644
--- a/test/src/org/fdroid/fdroid/AppProviderTest.java
+++ b/test/src/org/fdroid/fdroid/AppProviderTest.java
@@ -2,9 +2,10 @@ package org.fdroid.fdroid;
 
 import android.content.ContentValues;
 import android.database.Cursor;
-import android.net.Uri;
+
 import mock.MockCategoryResources;
 import mock.MockInstallablePackageManager;
+
 import org.fdroid.fdroid.data.ApkProvider;
 import org.fdroid.fdroid.data.App;
 import org.fdroid.fdroid.data.AppProvider;
diff --git a/test/src/org/fdroid/fdroid/TestUtils.java b/test/src/org/fdroid/fdroid/TestUtils.java
index 420c32c45..b61822a41 100644
--- a/test/src/org/fdroid/fdroid/TestUtils.java
+++ b/test/src/org/fdroid/fdroid/TestUtils.java
@@ -2,7 +2,6 @@ package org.fdroid.fdroid;
 
 import android.content.*;
 import android.net.Uri;
-import android.test.mock.MockContentResolver;
 import junit.framework.AssertionFailedError;
 import org.fdroid.fdroid.data.ApkProvider;
 import org.fdroid.fdroid.data.AppProvider;