diff --git a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
index 0638f3894..92a0e297f 100644
--- a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
@@ -1,6 +1,5 @@
 package eu.siacs.conversations.ui;
 
-import android.Manifest;
 import android.content.ActivityNotFoundException;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -12,7 +11,6 @@ import android.preference.PreferenceManager;
 import android.provider.ContactsContract.CommonDataKinds;
 import android.provider.ContactsContract.Contacts;
 import android.provider.ContactsContract.Intents;
-import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.Toolbar;
 import android.view.LayoutInflater;
diff --git a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
index 3e36ff520..906bfc738 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
@@ -201,7 +201,7 @@ public class XmppConnection implements Runnable {
         }
     }
 
-    protected void changeStatus(final Account.State nextStatus) {
+    private void changeStatus(final Account.State nextStatus) {
         synchronized (this) {
             if (Thread.currentThread().isInterrupted()) {
                 Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": not changing status to " + nextStatus + " because thread was interrupted");
@@ -502,7 +502,7 @@ public class XmppConnection implements Runnable {
             } else if (nextTag.isStart("features")) {
                 processStreamFeatures(nextTag);
             } else if (nextTag.isStart("proceed")) {
-                switchOverToTls(nextTag);
+                switchOverToTls();
             } else if (nextTag.isStart("success")) {
                 final String challenge = tagReader.readElement(nextTag).getContent();
                 try {
@@ -828,7 +828,7 @@ public class XmppConnection implements Runnable {
         tagWriter.writeTag(startTLS);
     }
 
-    private void switchOverToTls(final Tag currentTag) throws XmlPullParserException, IOException {
+    private void switchOverToTls() throws XmlPullParserException, IOException {
         tagReader.readTag();
         try {
             final TlsFactoryVerifier tlsFactoryVerifier = getTlsFactoryVerifier();
diff --git a/src/main/res/values-w384dp/dimens.xml b/src/main/res/values-w384dp/dimens.xml
index 61b9faa1f..f53cccbd1 100644
--- a/src/main/res/values-w384dp/dimens.xml
+++ b/src/main/res/values-w384dp/dimens.xml
@@ -2,7 +2,6 @@
 	<!-- 384dp is the screen width of the Nexus 4. Something like a Moto G is smaller but a Nexus 5X is larger -->
 	<!-- https://material.io/devices/ -->
 	<dimen name="fineprint_size">12sp</dimen>
-	<dimen name="swipe_handle_size">48dp</dimen>
 	<dimen name="audio_player_width">288dp</dimen>
 	<dimen name="avatar_on_details_screen_size">72dp</dimen>
 	<dimen name="media_size">64dp</dimen> <!-- ideally not larger than avatar_on_details_screen -->