Index: trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java	(revision 13172)
+++ trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java	(revision 13173)
@@ -164,10 +164,4 @@
         if (Main.main == null) {
             new MainApplication().initialize();
-        } else {
-            if (Main.main.panel == null) {
-                initMainPanel(false);
-                Main.main.panel = MainApplication.getMainPanel();
-            }
-            Main.main.panel.reAddListeners();
         }
         // Add a test layer to the layer manager to get the MapFrame
Index: trunk/test/unit/org/openstreetmap/josm/MainTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/MainTest.java	(revision 13172)
+++ trunk/test/unit/org/openstreetmap/josm/MainTest.java	(revision 13173)
@@ -5,10 +5,8 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.Collection;
 import java.util.Map;
 
@@ -33,38 +31,4 @@
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
     public JOSMTestRules test = new JOSMTestRules().platform().https().devAPI().main().projection();
-
-    /**
-     * Unit tests on log messages.
-     * @deprecated to remove end of 2017
-     */
-    @Test
-    @SuppressFBWarnings(value = "ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD")
-    @Deprecated
-    public void testLogs() {
-
-        assertNull(Main.getErrorMessage(null));
-
-        // Correct behaviour with errors
-        Main.error(new Exception("exception_error"));
-        Main.error("Error message on one line");
-        Main.error("Error message with {0}", "param");
-        Main.error("First line of error message on several lines\nline2\nline3\nline4");
-        Collection<String> errors = Main.getLastErrorAndWarnings();
-        assertTrue(errors.contains("E: java.lang.Exception: exception_error"));
-        assertTrue(errors.contains("E: Error message with param"));
-        assertTrue(errors.contains("E: Error message on one line"));
-        assertTrue(errors.contains("E: First line of error message on several lines"));
-
-        // Correct behaviour with warnings
-        Main.warn(new Exception("exception_warn", new Exception("root_cause")));
-        Main.warn(new Exception("exception_warn_bool"), true);
-        Main.warn("Warning message on one line");
-        Main.warn("First line of warning message on several lines\nline2\nline3\nline4");
-        Collection<String> warnings = Main.getLastErrorAndWarnings();
-        assertTrue(warnings.contains("W: java.lang.Exception: exception_warn. Cause: java.lang.Exception: root_cause"));
-        assertTrue(warnings.contains("W: java.lang.Exception: exception_warn_bool"));
-        assertTrue(warnings.contains("W: Warning message on one line"));
-        assertTrue(warnings.contains("W: First line of warning message on several lines"));
-    }
 
     /**
Index: trunk/test/unit/org/openstreetmap/josm/data/oauth/OAuthParametersTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/oauth/OAuthParametersTest.java	(revision 13172)
+++ trunk/test/unit/org/openstreetmap/josm/data/oauth/OAuthParametersTest.java	(revision 13173)
@@ -8,5 +8,4 @@
 import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.io.OsmApi;
@@ -48,14 +47,4 @@
 
     /**
-     * Unit test of method {@link OAuthParameters#createFromPreferences}.
-     * @deprecated to remove end of 2017
-     */
-    @Test
-    @Deprecated
-    public void testCreateFromPreferences() {
-        assertNotNull(OAuthParameters.createFromPreferences(Main.pref));
-    }
-
-    /**
      * Unit test of methods {@link OAuthParameters#equals} and {@link OAuthParameters#hashCode}.
      */
Index: trunk/test/unit/org/openstreetmap/josm/gui/MainApplicationTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/MainApplicationTest.java	(revision 13172)
+++ trunk/test/unit/org/openstreetmap/josm/gui/MainApplicationTest.java	(revision 13173)
@@ -81,5 +81,4 @@
      * @param reAddListeners {@code true} to re-add listeners
      */
-    @SuppressWarnings("deprecation")
     public static void initMainPanel(boolean reAddListeners) {
         if (MainApplication.mainPanel == null) {
@@ -89,7 +88,4 @@
             MainApplication.mainPanel.reAddListeners();
         }
-        if (Main.main != null) {
-            Main.main.panel = MainApplication.mainPanel;
-        }
     }
 
@@ -97,8 +93,6 @@
      * Make sure {@code MainApplication.menu} is initialized.
      */
-    @SuppressWarnings("deprecation")
     public static void initMainMenu() {
         MainApplication.menu = new MainMenu();
-        Main.main.menu = MainApplication.menu;
     }
 
@@ -106,11 +100,7 @@
      * Make sure {@link MainApplication#toolbar} is initialized.
      */
-    @SuppressWarnings("deprecation")
     public static void initToolbar() {
         if (MainApplication.toolbar == null) {
             MainApplication.toolbar = new ToolbarPreferences();
-        }
-        if (Main.toolbar == null) {
-            Main.toolbar = MainApplication.getToolbar();
         }
     }