diff --git a/mailbox-android/src/main/java/org/briarproject/mailbox/core/tor/AndroidLocationUtils.java b/mailbox-android/src/main/java/org/briarproject/mailbox/core/tor/AndroidLocationUtils.java
index ceee943eac0c7cae773923ca1fba611fb4a3c113..4fb9b179f8ee6868688586fe31b2ea3e74513897 100644
--- a/mailbox-android/src/main/java/org/briarproject/mailbox/core/tor/AndroidLocationUtils.java
+++ b/mailbox-android/src/main/java/org/briarproject/mailbox/core/tor/AndroidLocationUtils.java
@@ -26,18 +26,18 @@ import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 
 import org.briarproject.mailbox.core.system.LocationUtils;
+import org.slf4j.Logger;
 
 import java.util.Locale;
-import java.util.logging.Logger;
 
 import javax.inject.Inject;
 
 import static android.content.Context.TELEPHONY_SERVICE;
+import static org.slf4j.LoggerFactory.getLogger;
 
 class AndroidLocationUtils implements LocationUtils {
 
-	private static final Logger LOG =
-			Logger.getLogger(AndroidLocationUtils.class.getName());
+	private static final Logger LOG = getLogger(AndroidLocationUtils.class);
 
 	private final Context appContext;
 
diff --git a/mailbox-cli/src/main/java/org/briarproject/mailbox/cli/Main.kt b/mailbox-cli/src/main/java/org/briarproject/mailbox/cli/Main.kt
index f0028e4912897586cd93aeba5dda3f0e96b45bb2..4f8734c03dfb3fa4eb63e9d8796c8bf998003273 100644
--- a/mailbox-cli/src/main/java/org/briarproject/mailbox/cli/Main.kt
+++ b/mailbox-cli/src/main/java/org/briarproject/mailbox/cli/Main.kt
@@ -37,10 +37,6 @@ import org.briarproject.mailbox.core.setup.WipeManager
 import org.briarproject.mailbox.core.system.InvalidIdException
 import org.briarproject.mailbox.core.tor.TorPlugin
 import org.slf4j.LoggerFactory.getLogger
-import java.util.logging.Level.ALL
-import java.util.logging.Level.INFO
-import java.util.logging.Level.WARNING
-import java.util.logging.LogManager
 import javax.inject.Inject
 import kotlin.system.exitProcess
 
@@ -93,13 +89,7 @@ class Main : CliktCommand(
             1 -> Level.INFO
             else -> Level.DEBUG
         }
-        val level = if (debug) ALL else when (verbosity) {
-            0 -> WARNING
-            1 -> INFO
-            else -> ALL
-        }
         (getLogger(Logger.ROOT_LOGGER_NAME) as Logger).level = levelSlf4j
-        LogManager.getLogManager().getLogger("").level = level
 
         getLogger(this.javaClass).debug("Hello Mailbox")
         println("Hello Mailbox")
diff --git a/mailbox-core/src/main/java/org/briarproject/mailbox/core/PoliteExecutor.java b/mailbox-core/src/main/java/org/briarproject/mailbox/core/PoliteExecutor.java
index af5393ae9cca1a284184f6eec38a8d927a862bdc..a486936c066a27a97cf262829f94b853455fb25a 100644
--- a/mailbox-core/src/main/java/org/briarproject/mailbox/core/PoliteExecutor.java
+++ b/mailbox-core/src/main/java/org/briarproject/mailbox/core/PoliteExecutor.java
@@ -19,15 +19,16 @@
 
 package org.briarproject.mailbox.core;
 
+import org.slf4j.Logger;
+
 import java.util.LinkedList;
 import java.util.Queue;
 import java.util.concurrent.Executor;
-import java.util.logging.Logger;
 
 import javax.annotation.concurrent.GuardedBy;
 
-import static java.util.logging.Level.FINE;
 import static org.briarproject.mailbox.core.util.LogUtils.now;
+import static org.slf4j.LoggerFactory.getLogger;
 
 /**
  * An {@link Executor} that delegates its tasks to another {@link Executor}
@@ -41,7 +42,7 @@ public class PoliteExecutor implements Executor {
 	private final Queue<Runnable> queue = new LinkedList<>();
 	private final Executor delegate;
 	private final int maxConcurrentTasks;
-	private final Logger log;
+	private final Logger LOG;
 
 	@GuardedBy("lock")
 	private int concurrentTasks = 0;
@@ -58,16 +59,16 @@ public class PoliteExecutor implements Executor {
 			int maxConcurrentTasks) {
 		this.delegate = delegate;
 		this.maxConcurrentTasks = maxConcurrentTasks;
-		log = Logger.getLogger(tag);
+		LOG = getLogger(tag);
 	}
 
 	@Override
 	public void execute(Runnable r) {
 		long submitted = now();
 		Runnable wrapped = () -> {
-			if (log.isLoggable(FINE)) {
+			if (LOG.isDebugEnabled()) {
 				long queued = now() - submitted;
-				log.fine("Queue time " + queued + " ms");
+				LOG.debug("Queue time " + queued + " ms");
 			}
 			try {
 				r.run();