diff --git a/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java b/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java
index 0f52313..de44d7b 100644
--- a/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java
+++ b/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java
@@ -52,13 +52,10 @@ public class ExtensionFileFilter extends FileFilter implements java.io.FileFilte
 
         final List<Class<? extends FileImporter>> importerNames = Arrays.asList(
                 org.openstreetmap.josm.io.OsmImporter.class,
-                org.openstreetmap.josm.io.OsmGzipImporter.class,
-                org.openstreetmap.josm.io.OsmZipImporter.class,
                 org.openstreetmap.josm.io.OsmChangeImporter.class,
                 org.openstreetmap.josm.io.GpxImporter.class,
                 org.openstreetmap.josm.io.NMEAImporter.class,
                 org.openstreetmap.josm.io.NoteImporter.class,
-                org.openstreetmap.josm.io.OsmBzip2Importer.class,
                 org.openstreetmap.josm.io.JpgImporter.class,
                 org.openstreetmap.josm.io.WMSLayerImporter.class,
                 org.openstreetmap.josm.io.AllFormatsImporter.class,
@@ -98,8 +95,6 @@ public class ExtensionFileFilter extends FileFilter implements java.io.FileFilte
         final List<Class<? extends FileExporter>> exporterClasses = Arrays.asList(
                 org.openstreetmap.josm.io.GpxExporter.class,
                 org.openstreetmap.josm.io.OsmExporter.class,
-                org.openstreetmap.josm.io.OsmGzipExporter.class,
-                org.openstreetmap.josm.io.OsmBzip2Exporter.class,
                 org.openstreetmap.josm.io.GeoJSONExporter.CurrentProjection.class, // needs to be considered earlier than GeoJSONExporter
                 org.openstreetmap.josm.io.GeoJSONExporter.class,
                 org.openstreetmap.josm.io.WMSLayerExporter.class,
diff --git a/src/org/openstreetmap/josm/io/OsmBzip2Exporter.java b/src/org/openstreetmap/josm/io/OsmBzip2Exporter.java
deleted file mode 100644
index a3dd2f6..0000000
--- a/src/org/openstreetmap/josm/io/OsmBzip2Exporter.java
+++ /dev/null
@@ -1,18 +0,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.io;
-
-/**
- * OSM data exporter that compresses it in Bzip2 format.
- */
-public class OsmBzip2Exporter extends OsmExporter {
-
-    /**
-     * Constructs a new {@code OsmBzip2Exporter}.
-     */
-    public OsmBzip2Exporter() {
-        super(OsmBzip2Importer.FILE_FILTER);
-    }
-
-    // compression handling is performed in super-class
-
-}
diff --git a/src/org/openstreetmap/josm/io/OsmBzip2Importer.java b/src/org/openstreetmap/josm/io/OsmBzip2Importer.java
deleted file mode 100644
index de84539..0000000
--- a/src/org/openstreetmap/josm/io/OsmBzip2Importer.java
+++ /dev/null
@@ -1,28 +0,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.io;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
-
-import org.openstreetmap.josm.actions.ExtensionFileFilter;
-
-/**
- * OSM data importer that uncompresses it from Bzip2 format.
- */
-public class OsmBzip2Importer extends OsmImporter {
-
-    /**
-     * File filter used to load/save Bzip2 compressed OSM files.
-     */
-    public static final ExtensionFileFilter FILE_FILTER = new ExtensionFileFilter(
-            "osm.bz2,osm.bz", "osm.bz2", tr("OSM Server Files bzip2 compressed") + " (*.osm.bz2 *.osm.bz)");
-
-    /**
-     * Constructs a new {@code OsmBzip2Importer}.
-     */
-    public OsmBzip2Importer() {
-        super(FILE_FILTER);
-    }
-
-    // compression handling is performed in super-class
-
-}
diff --git a/src/org/openstreetmap/josm/io/OsmGzipExporter.java b/src/org/openstreetmap/josm/io/OsmGzipExporter.java
deleted file mode 100644
index 77ca4e1..0000000
--- a/src/org/openstreetmap/josm/io/OsmGzipExporter.java
+++ /dev/null
@@ -1,18 +0,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.io;
-
-/**
- * OSM data exporter that compresses it in GZip format.
- */
-public class OsmGzipExporter extends OsmExporter {
-
-    /**
-     * Constructs a new {@code OsmGzipExporter}.
-     */
-    public OsmGzipExporter() {
-        super(OsmGzipImporter.FILE_FILTER);
-    }
-
-    // compression handling is performed in super-class
-
-}
diff --git a/src/org/openstreetmap/josm/io/OsmGzipImporter.java b/src/org/openstreetmap/josm/io/OsmGzipImporter.java
deleted file mode 100644
index 9ab1df7..0000000
--- a/src/org/openstreetmap/josm/io/OsmGzipImporter.java
+++ /dev/null
@@ -1,28 +0,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.io;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
-
-import org.openstreetmap.josm.actions.ExtensionFileFilter;
-
-/**
- * OSM data importer that uncompresses it from Gzip format.
- */
-public class OsmGzipImporter extends OsmImporter {
-
-    /**
-     * File filter used to load/save Gzip compressed OSM files.
-     */
-    public static final ExtensionFileFilter FILE_FILTER = new ExtensionFileFilter(
-            "osm.gz", "osm.gz", tr("OSM Server Files gzip compressed") + " (*.osm.gz)");
-
-    /**
-     * Constructs a new {@code OsmGzipImporter}.
-     */
-    public OsmGzipImporter() {
-        super(FILE_FILTER);
-    }
-
-    // compression handling is performed in super-class
-
-}
diff --git a/src/org/openstreetmap/josm/io/OsmImporter.java b/src/org/openstreetmap/josm/io/OsmImporter.java
index fa54c0b..dd7cdf1 100644
--- a/src/org/openstreetmap/josm/io/OsmImporter.java
+++ b/src/org/openstreetmap/josm/io/OsmImporter.java
@@ -21,10 +21,10 @@ import org.openstreetmap.josm.gui.util.GuiHelper;
 public class OsmImporter extends FileImporter {
 
     /**
-     * The OSM file filter (*.osm and *.xml files).
+     * The OSM file filter (*.osm files).
      */
     public static final ExtensionFileFilter FILE_FILTER = new ExtensionFileFilter(
-            "osm,xml", "osm", tr("OSM Server Files") + " (*.osm *.xml)");
+            "osm,xml,osm.gz,osm.bz2,osm.bz,osm.zip", "osm", tr("OSM Server Files") + " (*.osm, *.xml, *.osm.gz, *.osm.bz2, *.osm.bz, *.osm.zip)");
 
     /**
      * Utility class containing imported OSM layer, and a task to run after it is added to MapView.
diff --git a/src/org/openstreetmap/josm/io/OsmZipImporter.java b/src/org/openstreetmap/josm/io/OsmZipImporter.java
deleted file mode 100644
index d9b4e6d..0000000
--- a/src/org/openstreetmap/josm/io/OsmZipImporter.java
+++ /dev/null
@@ -1,28 +0,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.io;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
-
-import org.openstreetmap.josm.actions.ExtensionFileFilter;
-
-/**
- * OSM data importer that uncompresses it from Zip format.
- * @since 6882
- */
-public class OsmZipImporter extends OsmImporter {
-
-    /**
-     * File filter used to load/save Zip compressed OSM files.
-     */
-    public static final ExtensionFileFilter FILE_FILTER = new ExtensionFileFilter(
-            "osm.zip", "osm.zip", tr("OSM Server Files zip compressed") + " (*.osm.zip)");
-
-    /**
-     * Constructs a new {@code OsmZipImporter}.
-     */
-    public OsmZipImporter() {
-        super(FILE_FILTER);
-    }
-
-    // compression handling is performed in super-class
-}
