diff --git a/src/main/kotlin/org/briarproject/briar/compose/MainUI.java b/src/main/kotlin/org/briarproject/briar/compose/MainUI.java
index 6b33d76cb2e14ffe96b835e600e233c0213fdc70..e583ad5c71dc162a634d7ff58ed1b23693fb20bc 100644
--- a/src/main/kotlin/org/briarproject/briar/compose/MainUI.java
+++ b/src/main/kotlin/org/briarproject/briar/compose/MainUI.java
@@ -53,7 +53,7 @@ public class MainUI extends JFrame implements EventListener {
 	private final PrivateMessageFactory privateMessageFactory;
 	private final EventBus eventBus;
 	private final PasswordStrengthEstimator passwordStrengthEstimator;
-	private final Configuration configuration;
+//	private final Configuration configuration;
 
 	private JPanel mainPanel;
 	private JPanel contentPanel;
@@ -70,8 +70,8 @@ public class MainUI extends JFrame implements EventListener {
 			IntroductionManager introductionManager,
 			PrivateMessageFactory privateMessageFactory,
 			EventBus eventBus,
-			PasswordStrengthEstimator passwordStrengthEstimator,
-			Configuration configuration) {
+			PasswordStrengthEstimator passwordStrengthEstimator
+			/*Configuration configuration*/) {
 		this.briarService = briarService;
 		this.accountManager = accountManager;
 		this.contactManager = contactManager;
@@ -81,16 +81,16 @@ public class MainUI extends JFrame implements EventListener {
 		this.privateMessageFactory = privateMessageFactory;
 		this.eventBus = eventBus;
 		this.passwordStrengthEstimator = passwordStrengthEstimator;
-		this.configuration = configuration;
-
-		String lookAndFeel = configuration.getLookAndFeel();
-		if (lookAndFeel != null) {
-			try {
-				UIManager.setLookAndFeel(lookAndFeel);
-			} catch (Exception e) {
-				logger.error("error while setting look and feel", e);
-			}
-		}
+//		this.configuration = configuration;
+
+//		String lookAndFeel = configuration.getLookAndFeel();
+//		if (lookAndFeel != null) {
+//			try {
+//				UIManager.setLookAndFeel(lookAndFeel);
+//			} catch (Exception e) {
+//				logger.error("error while setting look and feel", e);
+//			}
+//		}
 
 		setTitle("Briar Swing");
 //		setJMenuBar(new MainMenu(this));
@@ -119,9 +119,9 @@ public class MainUI extends JFrame implements EventListener {
 //		eventBus.addListener(this);
 	}
 
-	public Configuration getConfiguration() {
-		return configuration;
-	}
+//	public Configuration getConfiguration() {
+//		return configuration;
+//	}
 
 	public AccountManager getAccountManager() {
 		return accountManager;
diff --git a/src/main/kotlin/org/briarproject/briar/compose/UI.kt b/src/main/kotlin/org/briarproject/briar/compose/UI.kt
index cd10bb9c2e4dc1857ca9d4ebcb0bf4682ed1ace4..5671b447697528d20137047eaa2b1a4d579bcc7c 100644
--- a/src/main/kotlin/org/briarproject/briar/compose/UI.kt
+++ b/src/main/kotlin/org/briarproject/briar/compose/UI.kt
@@ -35,7 +35,7 @@ constructor(
 ) {
 
     private val logger = getLogger(UI::javaClass.name)
-    private val configuration = Configuration()
+//    private val configuration = Configuration()
 
     internal fun startBriar() {
         briarService.start();
@@ -52,7 +52,7 @@ constructor(
             privateMessageFactory,
             eventBus,
             passwordStrengthEstimator,
-            configuration
+//            configuration
         );
 
         mainUI.defaultCloseOperation = JFrame.EXIT_ON_CLOSE;