diff --git a/app/src/main/java/eu/faircode/email/ActivitySetup.java b/app/src/main/java/eu/faircode/email/ActivitySetup.java
index 980fb319e7..3f4c42aad6 100644
--- a/app/src/main/java/eu/faircode/email/ActivitySetup.java
+++ b/app/src/main/java/eu/faircode/email/ActivitySetup.java
@@ -19,8 +19,6 @@ package eu.faircode.email;
     Copyright 2018-2023 by Marcel Bokhorst (M66B)
 */
 
-import static eu.faircode.email.ServiceAuthenticator.AUTH_TYPE_GMAIL;
-
 import android.Manifest;
 import android.app.Activity;
 import android.content.BroadcastReceiver;
diff --git a/app/src/main/java/eu/faircode/email/FragmentFolders.java b/app/src/main/java/eu/faircode/email/FragmentFolders.java
index e30da6172f..85c6c811c9 100644
--- a/app/src/main/java/eu/faircode/email/FragmentFolders.java
+++ b/app/src/main/java/eu/faircode/email/FragmentFolders.java
@@ -74,7 +74,6 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.snackbar.Snackbar;
 
 import org.json.JSONException;
-import org.json.JSONObject;
 
 import java.io.BufferedOutputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsBackup.java b/app/src/main/java/eu/faircode/email/FragmentOptionsBackup.java
index 86989520e0..d4d5d24bb3 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsBackup.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsBackup.java
@@ -21,7 +21,6 @@ package eu.faircode.email;
 
 import static android.app.Activity.RESULT_CANCELED;
 import static android.app.Activity.RESULT_OK;
-
 import static eu.faircode.email.ServiceAuthenticator.AUTH_TYPE_GMAIL;
 
 import android.app.Dialog;
@@ -47,9 +46,6 @@ import android.text.style.StyleSpan;
 import android.util.Pair;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
diff --git a/app/src/main/java/eu/faircode/email/ViewModelExport.java b/app/src/main/java/eu/faircode/email/ViewModelExport.java
index bda145914b..1d59269230 100644
--- a/app/src/main/java/eu/faircode/email/ViewModelExport.java
+++ b/app/src/main/java/eu/faircode/email/ViewModelExport.java
@@ -22,9 +22,6 @@ package eu.faircode.email;
 import androidx.lifecycle.SavedStateHandle;
 import androidx.lifecycle.ViewModel;
 
-import java.util.HashMap;
-import java.util.Map;
-
 public class ViewModelExport extends ViewModel {
     private SavedStateHandle state;