diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
index 174eac841..e1b6c6f5e 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
@@ -1409,26 +1409,18 @@ public class ConversationActivity extends XmppActivity
 			AlertDialog.Builder builder = new AlertDialog.Builder(this);
 			builder.setTitle(R.string.battery_optimizations_enabled);
 			builder.setMessage(R.string.battery_optimizations_enabled_dialog);
-			builder.setPositiveButton(R.string.next, new OnClickListener() {
-				@Override
-				public void onClick(DialogInterface dialog, int which) {
-					Intent intent = new Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
-					Uri uri = Uri.parse("package:" + getPackageName());
-					intent.setData(uri);
-					try {
-						startActivityForResult(intent, REQUEST_BATTERY_OP);
-					} catch (ActivityNotFoundException e) {
-						Toast.makeText(ConversationActivity.this, R.string.device_does_not_support_battery_op, Toast.LENGTH_SHORT).show();
-					}
+			builder.setPositiveButton(R.string.next, (dialog, which) -> {
+				Intent intent = new Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
+				Uri uri = Uri.parse("package:" + getPackageName());
+				intent.setData(uri);
+				try {
+					startActivityForResult(intent, REQUEST_BATTERY_OP);
+				} catch (ActivityNotFoundException e) {
+					Toast.makeText(ConversationActivity.this, R.string.device_does_not_support_battery_op, Toast.LENGTH_SHORT).show();
 				}
 			});
 			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
-				builder.setOnDismissListener(new DialogInterface.OnDismissListener() {
-					@Override
-					public void onDismiss(DialogInterface dialog) {
-						setNeverAskForBatteryOptimizationsAgain();
-					}
-				});
+				builder.setOnDismissListener(dialog -> setNeverAskForBatteryOptimizationsAgain());
 			}
 			AlertDialog dialog = builder.create();
 			dialog.setCanceledOnTouchOutside(false);
diff --git a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
index 5b26576e6..67706a952 100644
--- a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
@@ -538,8 +538,7 @@ public abstract class XmppActivity extends AppCompatActivity {
 	}
 
 	protected void inviteToConversation(Conversation conversation) {
-		Intent intent = new Intent(getApplicationContext(),
-				ChooseContactActivity.class);
+		Intent intent = new Intent(this, ChooseContactActivity.class);
 		List<String> contacts = new ArrayList<>();
 		if (conversation.getMode() == Conversation.MODE_MULTI) {
 			for (MucOptions.User user : conversation.getMucOptions().getUsers(false)) {
diff --git a/src/main/res/menu/verification_choices.xml b/src/main/res/menu/verification_choices.xml
deleted file mode 100644
index e833ba79d..000000000
--- a/src/main/res/menu/verification_choices.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item
-        android:id="@+id/scan_fingerprint"
-        android:title="@string/scan_qr_code"/>
-    <item
-        android:id="@+id/ask_question"
-        android:title="@string/ask_question"/>
-
-    <item
-        android:id="@+id/manual_verification"
-        android:title="@string/manually_verify" />
-
-</menu>
\ No newline at end of file
diff --git a/src/main/res/menu/verify_otr.xml b/src/main/res/menu/verify_otr.xml
deleted file mode 100644
index 6517ae0b1..000000000
--- a/src/main/res/menu/verify_otr.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-	  xmlns:app="http://schemas.android.com/apk/res-auto">
-
-	<item
-		android:id="@+id/action_show_qr_code"
-		android:title="@string/show_qr_code"
-		app:showAsAction="never" />
-
-    <item
-        android:id="@+id/action_accounts"
-        android:orderInCategory="90"
-        app:showAsAction="never"
-        android:title="@string/action_accounts" />
-    <item
-        android:id="@+id/action_settings"
-        android:orderInCategory="100"
-        app:showAsAction="never"
-        android:title="@string/action_settings" />
-</menu>
\ No newline at end of file