diff --git a/src/org/kde/kdeconnect/BackgroundService.java b/src/org/kde/kdeconnect/BackgroundService.java
index b2f3c8f6..06bda147 100644
--- a/src/org/kde/kdeconnect/BackgroundService.java
+++ b/src/org/kde/kdeconnect/BackgroundService.java
@@ -34,7 +34,6 @@ import android.util.Log;
 import org.kde.kdeconnect.Backends.BaseLink;
 import org.kde.kdeconnect.Backends.BaseLinkProvider;
 import org.kde.kdeconnect.Backends.LanBackend.LanLinkProvider;
-import org.kde.kdeconnect.UserInterface.MainSettingsActivity;
 
 import java.security.KeyPair;
 import java.security.KeyPairGenerator;
diff --git a/src/org/kde/kdeconnect/NetworkPackage.java b/src/org/kde/kdeconnect/NetworkPackage.java
index 51d80217..42f06869 100644
--- a/src/org/kde/kdeconnect/NetworkPackage.java
+++ b/src/org/kde/kdeconnect/NetworkPackage.java
@@ -31,7 +31,6 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.kde.kdeconnect.Helpers.DeviceHelper;
-import org.kde.kdeconnect.UserInterface.MainSettingsActivity;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
diff --git a/src/org/kde/kdeconnect/NewUserInterface/DeviceFragment.java b/src/org/kde/kdeconnect/NewUserInterface/DeviceFragment.java
index dc5999c6..c032dbb6 100644
--- a/src/org/kde/kdeconnect/NewUserInterface/DeviceFragment.java
+++ b/src/org/kde/kdeconnect/NewUserInterface/DeviceFragment.java
@@ -24,7 +24,6 @@ import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
-import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
diff --git a/src/org/kde/kdeconnect/NewUserInterface/MaterialActivity.java b/src/org/kde/kdeconnect/NewUserInterface/MaterialActivity.java
index 3c546688..fde84643 100644
--- a/src/org/kde/kdeconnect/NewUserInterface/MaterialActivity.java
+++ b/src/org/kde/kdeconnect/NewUserInterface/MaterialActivity.java
@@ -18,14 +18,12 @@ import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.ArrayAdapter;
 import android.widget.EditText;
 import android.widget.TextView;
 
 import org.kde.kdeconnect.BackgroundService;
 import org.kde.kdeconnect.Device;
 import org.kde.kdeconnect.Helpers.DeviceHelper;
-import org.kde.kdeconnect.UserInterface.MainSettingsActivity;
 import org.kde.kdeconnect_tp.R;
 
 import java.util.Collection;
diff --git a/src/org/kde/kdeconnect/NewUserInterface/PairingFragment.java b/src/org/kde/kdeconnect/NewUserInterface/PairingFragment.java
index 2b54dd8d..5ab125d5 100644
--- a/src/org/kde/kdeconnect/NewUserInterface/PairingFragment.java
+++ b/src/org/kde/kdeconnect/NewUserInterface/PairingFragment.java
@@ -21,17 +21,13 @@
 package org.kde.kdeconnect.NewUserInterface;
 
 import android.app.Activity;
-import android.app.LauncherActivity;
 import android.content.Intent;
 import android.content.res.Resources;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
-import android.support.v7.app.AppCompatActivity;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.AdapterView;
 import android.widget.ListView;
 import android.widget.TextView;
 
diff --git a/src/org/kde/kdeconnect/NewUserInterface/PluginPreference.java b/src/org/kde/kdeconnect/NewUserInterface/PluginPreference.java
index 06a55228..0f9284fe 100644
--- a/src/org/kde/kdeconnect/NewUserInterface/PluginPreference.java
+++ b/src/org/kde/kdeconnect/NewUserInterface/PluginPreference.java
@@ -1,6 +1,5 @@
 package org.kde.kdeconnect.NewUserInterface;
 
-import android.content.Context;
 import android.preference.CheckBoxPreference;
 import android.view.View;