Index: /trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java	(revision 17481)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java	(revision 17482)
@@ -57,5 +57,4 @@
 import org.openstreetmap.josm.gui.preferences.map.BackupPreference;
 import org.openstreetmap.josm.gui.preferences.map.MapPaintPreference;
-import org.openstreetmap.josm.gui.preferences.map.MapPreference;
 import org.openstreetmap.josm.gui.preferences.map.TaggingPresetPreference;
 import org.openstreetmap.josm.gui.preferences.plugin.PluginPreference;
@@ -387,14 +386,4 @@
 
     /**
-     * Returns the {@code MapPreference} object.
-     * @return the {@code MapPreference} object.
-     * @deprecated to remove beginning of 2021
-     */
-    @Deprecated
-    public MapPreference getMapPreference() {
-        return getSetting(MapPreference.class);
-    }
-
-    /**
      * Returns the {@code PluginPreference} object.
      * @return the {@code PluginPreference} object.
@@ -619,5 +608,4 @@
         SETTINGS_FACTORIES.add(new ServerAccessPreference.Factory());
         SETTINGS_FACTORIES.add(new ProxyPreference.Factory());
-        SETTINGS_FACTORIES.add(new MapPreference.Factory());
         SETTINGS_FACTORIES.add(new ProjectionPreference.Factory());
         SETTINGS_FACTORIES.add(new MapPaintPreference.Factory());
Index: unk/src/org/openstreetmap/josm/gui/preferences/map/MapPreference.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/map/MapPreference.java	(revision 17481)
+++ 	(revision )
@@ -1,47 +1,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.preferences.map;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
-
-import org.openstreetmap.josm.gui.help.HelpUtil;
-import org.openstreetmap.josm.gui.preferences.ExtensibleTabPreferenceSetting;
-import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
-import org.openstreetmap.josm.gui.preferences.PreferenceSettingFactory;
-
-/**
- * Map preferences, including map paint styles, tagging presets and autosave sub-preferences.
- * @deprecated to remove beginning of 2021
- */
-@Deprecated
-public final class MapPreference extends ExtensibleTabPreferenceSetting {
-
-    /**
-     * Factory used to create a new {@code MapPreference}.
-     */
-    public static class Factory implements PreferenceSettingFactory {
-        @Override
-        public PreferenceSetting createPreferenceSetting() {
-            return new MapPreference();
-        }
-    }
-
-    private MapPreference() {
-        super(/* ICON(preferences/) */ "map", tr("Map"),
-                tr("Settings for the map projection and data interpretation."), false);
-    }
-
-    @Override
-    public boolean ok() {
-        return false;
-    }
-
-    @Override
-    public String getHelpContext() {
-        return HelpUtil.ht("/Preferences/Map");
-    }
-
-    @Override
-    protected boolean canBeHidden() {
-        return true;
-    }
-}
Index: unk/test/unit/org/openstreetmap/josm/gui/preferences/map/MapPreferenceTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/gui/preferences/map/MapPreferenceTest.java	(revision 17481)
+++ 	(revision )
@@ -1,41 +1,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.preferences.map;
-
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-import org.openstreetmap.josm.JOSMFixture;
-import org.openstreetmap.josm.gui.preferences.PreferencesTestUtils;
-
-/**
- * Unit tests of {@link MapPreference} class.
- * @deprecated to remove beginning of 2021
- */
-@Deprecated
-class MapPreferenceTest {
-
-    /**
-     * Setup test.
-     */
-    @BeforeAll
-    public static void setUpBeforeClass() {
-        JOSMFixture.createUnitTestFixture().init();
-    }
-
-    /**
-     * Unit test of {@link MapPreference#MapPreference}.
-     */
-    @Test
-    void testMapPreference() {
-        assertNotNull(new MapPreference.Factory().createPreferenceSetting());
-    }
-
-    /**
-     * Unit test of {@link MapPreference#addGui}.
-     */
-    @Test
-    void testAddGui() {
-        PreferencesTestUtils.doTestPreferenceSettingAddGui(new MapPreference.Factory(), null);
-    }
-}