diff --git a/src/org/kde/kdeconnect/Backends/BaseLinkProvider.java b/src/org/kde/kdeconnect/Backends/BaseLinkProvider.java
index 5fabf80d..db8a939a 100644
--- a/src/org/kde/kdeconnect/Backends/BaseLinkProvider.java
+++ b/src/org/kde/kdeconnect/Backends/BaseLinkProvider.java
@@ -31,11 +31,6 @@ import java.util.concurrent.CopyOnWriteArrayList;
 public abstract class BaseLinkProvider {
 
     private final CopyOnWriteArrayList<ConnectionReceiver> connectionReceivers = new CopyOnWriteArrayList<>();
-    protected BasePairingHandler pairingHandler;
-
-    public BasePairingHandler getPairingHandler() {
-        return pairingHandler;
-    }
 
     public interface ConnectionReceiver {
         void onConnectionReceived(NetworkPackage identityPackage, BaseLink link);
diff --git a/src/org/kde/kdeconnect/Backends/LanBackend/LanPairingHandler.java b/src/org/kde/kdeconnect/Backends/LanBackend/LanPairingHandler.java
index a21a4185..865f38be 100644
--- a/src/org/kde/kdeconnect/Backends/LanBackend/LanPairingHandler.java
+++ b/src/org/kde/kdeconnect/Backends/LanBackend/LanPairingHandler.java
@@ -98,18 +98,16 @@ public class LanPairingHandler extends BasePairingHandler {
 
             } else {
 
-                /**
-                 * If device is already paired, accept pairing silently
-                 */
+                // If device is already paired, accept pairing silently
                 if (mDevice.isPaired()) {
                     acceptPairing();
                     return;
                 }
 
-                /**
-                 * Pairing notifications are still managed by device as there is no other way to know about notificationId to cancel notification when PairActivity is started
-                 * Even putting notificationId in intent does not work because PairActivity can be started from MainActivity too, so then notificationId cannot be set
-                 */
+                // Pairing notifications are still managed by device as there is no other way to
+                // know about notificationId to cancel notification when PairActivity is started
+                // Even putting notificationId in intent does not work because PairActivity can be
+                // started from MainActivity too, so then notificationId cannot be set
                 hidePairingNotification();
                 mDevice.displayPairingNotification();
 
diff --git a/src/org/kde/kdeconnect/UserInterface/MaterialActivity.java b/src/org/kde/kdeconnect/UserInterface/MaterialActivity.java
index 3f6237f7..da57b498 100644
--- a/src/org/kde/kdeconnect/UserInterface/MaterialActivity.java
+++ b/src/org/kde/kdeconnect/UserInterface/MaterialActivity.java
@@ -203,7 +203,7 @@ public class MaterialActivity extends AppCompatActivity {
 
     //TODO: Make it accept two parameters, a constant with the type of screen and the device id in
     //case the screen is for a device, or even three parameters and the third one be the plugin id?
-    //This way we can keep adding more options with null plugin id (eg: about)
+    //This way we can keep adding more options with null device id (eg: about, help...)
     public void onDeviceSelected(String deviceId, boolean stack) {
 
         mCurrentDevice = deviceId;