Index: /trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java	(revision 17377)
+++ /trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java	(revision 17378)
@@ -473,9 +473,7 @@
         if (dataSet == null)
             return;
-        if (InstanceHolder.map.remove(dataSet) != null) {
-            redoCommands.clear();
-            commands.clear();
-            fireEvent(new CommandQueueCleanedEvent(this, dataSet));
-            fireCommandsChanged();
+        UndoRedoHandler old = InstanceHolder.map.remove(dataSet);
+        if (old != null) {
+            old.clean();
         }
     }