diff --git a/src/org/kde/kdeconnect/Plugins/MouseReceiverPlugin/MouseReceiverPlugin.java b/src/org/kde/kdeconnect/Plugins/MouseReceiverPlugin/MouseReceiverPlugin.java
index 0180f818..a2d79172 100644
--- a/src/org/kde/kdeconnect/Plugins/MouseReceiverPlugin/MouseReceiverPlugin.java
+++ b/src/org/kde/kdeconnect/Plugins/MouseReceiverPlugin/MouseReceiverPlugin.java
@@ -15,7 +15,6 @@ import androidx.fragment.app.DialogFragment;
 
 import org.kde.kdeconnect.NetworkPacket;
 import org.kde.kdeconnect.Plugins.Plugin;
-import org.kde.kdeconnect.Plugins.PluginFactory;
 import org.kde.kdeconnect.Plugins.RemoteKeyboardPlugin.RemoteKeyboardPlugin;
 import org.kde.kdeconnect.UserInterface.MainActivity;
 import org.kde.kdeconnect.UserInterface.StartActivityAlertDialogFragment;
@@ -50,12 +49,6 @@ public class MouseReceiverPlugin extends Plugin {
                 .create();
     }
 
-    @Override
-    public void onDestroy() {
-        Log.e("MouseReceiverPlugin", "onDestroy()");
-        super.onDestroy();
-    }
-
     @Override
     public boolean onPacketReceived(NetworkPacket np) {
         if (!np.getType().equals(PACKET_TYPE_MOUSEPAD_REQUEST)) {
diff --git a/src/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationFilterActivity.java b/src/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationFilterActivity.java
index 1fe47981..fa0034c6 100644
--- a/src/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationFilterActivity.java
+++ b/src/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationFilterActivity.java
@@ -35,7 +35,6 @@ import androidx.core.widget.TextViewCompat;
 import com.google.android.material.materialswitch.MaterialSwitch;
 
 import org.kde.kdeconnect.Helpers.ThreadHelper;
-import org.kde.kdeconnect.UserInterface.ThemeUtil;
 import org.kde.kdeconnect_tp.R;
 import org.kde.kdeconnect_tp.databinding.ActivityNotificationFilterBinding;
 
@@ -43,8 +42,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
-import java.util.function.IntFunction;
-import java.util.function.Predicate;
 
 //TODO: Turn this into a PluginSettingsFragment
 public class NotificationFilterActivity extends AppCompatActivity {
diff --git a/src/org/kde/kdeconnect/Plugins/Plugin.java b/src/org/kde/kdeconnect/Plugins/Plugin.java
index b059dbbd..8a719260 100644
--- a/src/org/kde/kdeconnect/Plugins/Plugin.java
+++ b/src/org/kde/kdeconnect/Plugins/Plugin.java
@@ -220,10 +220,11 @@ public abstract class Plugin {
 
     /**
      * Finish any ongoing operations, remove listeners... so
-     * this object could be garbage collected.
+     * this object could be garbage collected. Note that this gets
+     * called as well if onCreate threw an exception, so your plugin
+     * could be not fully initialized.
      */
-    public void onDestroy() {
-    }
+    public void onDestroy() { }
 
     /**
      * Called when a plugin receives a packet. By convention we return true
diff --git a/src/org/kde/kdeconnect/Plugins/PluginFactory.java b/src/org/kde/kdeconnect/Plugins/PluginFactory.java
index ee818f7e..85e0615d 100644
--- a/src/org/kde/kdeconnect/Plugins/PluginFactory.java
+++ b/src/org/kde/kdeconnect/Plugins/PluginFactory.java
@@ -24,7 +24,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.stream.Collectors;
 
 public class PluginFactory {
 
diff --git a/src/org/kde/kdeconnect/Plugins/SMSPlugin/SMSPlugin.java b/src/org/kde/kdeconnect/Plugins/SMSPlugin/SMSPlugin.java
index 9be1a6fc..fc70164f 100644
--- a/src/org/kde/kdeconnect/Plugins/SMSPlugin/SMSPlugin.java
+++ b/src/org/kde/kdeconnect/Plugins/SMSPlugin/SMSPlugin.java
@@ -44,7 +44,6 @@ import org.kde.kdeconnect.NetworkPacket;
 import org.kde.kdeconnect.Plugins.Plugin;
 import org.kde.kdeconnect.Plugins.PluginFactory;
 import org.kde.kdeconnect.Plugins.TelephonyPlugin.TelephonyPlugin;
-import org.kde.kdeconnect.UserInterface.AlertDialogFragment;
 import org.kde.kdeconnect.UserInterface.PluginSettingsFragment;
 import org.kde.kdeconnect_tp.BuildConfig;
 import org.kde.kdeconnect_tp.R;
diff --git a/src/org/kde/kdeconnect/UserInterface/About/AboutData.kt b/src/org/kde/kdeconnect/UserInterface/About/AboutData.kt
index 55ab1f43..6c6bbf1d 100644
--- a/src/org/kde/kdeconnect/UserInterface/About/AboutData.kt
+++ b/src/org/kde/kdeconnect/UserInterface/About/AboutData.kt
@@ -6,7 +6,6 @@
 
 package org.kde.kdeconnect.UserInterface.About
 
-import android.content.Context
 import android.os.Parcel
 import android.os.Parcelable
 
diff --git a/src/org/kde/kdeconnect/UserInterface/About/AboutKDEActivity.kt b/src/org/kde/kdeconnect/UserInterface/About/AboutKDEActivity.kt
index 4a3d61f0..63e87982 100644
--- a/src/org/kde/kdeconnect/UserInterface/About/AboutKDEActivity.kt
+++ b/src/org/kde/kdeconnect/UserInterface/About/AboutKDEActivity.kt
@@ -11,7 +11,6 @@ import android.text.Html
 import android.text.Spanned
 import android.text.method.LinkMovementMethod
 import androidx.appcompat.app.AppCompatActivity
-import org.kde.kdeconnect.UserInterface.ThemeUtil
 import org.kde.kdeconnect_tp.R
 import org.kde.kdeconnect_tp.databinding.ActivityAboutKdeBinding
 
diff --git a/src/org/kde/kdeconnect/UserInterface/StartActivityAlertDialogFragment.java b/src/org/kde/kdeconnect/UserInterface/StartActivityAlertDialogFragment.java
index 1a481a4a..aa47326b 100644
--- a/src/org/kde/kdeconnect/UserInterface/StartActivityAlertDialogFragment.java
+++ b/src/org/kde/kdeconnect/UserInterface/StartActivityAlertDialogFragment.java
@@ -14,7 +14,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import org.apache.commons.lang3.StringUtils;
-import org.kde.kdeconnect_tp.BuildConfig;
 
 public class StartActivityAlertDialogFragment extends AlertDialogFragment {
     private static final String KEY_INTENT_ACTION = "IntentAction";
diff --git a/src/org/kde/kdeconnect/UserInterface/compose/TextFields.kt b/src/org/kde/kdeconnect/UserInterface/compose/TextFields.kt
index 4a1a4d73..63dda982 100644
--- a/src/org/kde/kdeconnect/UserInterface/compose/TextFields.kt
+++ b/src/org/kde/kdeconnect/UserInterface/compose/TextFields.kt
@@ -10,7 +10,6 @@ import android.annotation.SuppressLint
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
 import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Modifier