Index: trunk/src/org/openstreetmap/josm/Main.java
===================================================================
--- trunk/src/org/openstreetmap/josm/Main.java	(revision 10686)
+++ trunk/src/org/openstreetmap/josm/Main.java	(revision 10687)
@@ -73,5 +73,4 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.PrimitiveDeepCopy;
 import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.data.projection.ProjectionChangeListener;
@@ -84,6 +83,4 @@
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.MapFrameListener;
-import org.openstreetmap.josm.gui.datatransfer.OsmTransferHandler;
-import org.openstreetmap.josm.gui.datatransfer.data.OsmLayerTransferData;
 import org.openstreetmap.josm.gui.help.HelpUtil;
 import org.openstreetmap.josm.gui.io.SaveLayersDialog;
@@ -179,18 +176,4 @@
 
     /**
-     * The global paste buffer.
-     * @deprecated Use swing CCP instead. See {@link OsmTransferHandler}
-     */
-    @Deprecated
-    public static final PrimitiveDeepCopy pasteBuffer = new PrimitiveDeepCopy();
-
-    /**
-     * The layer source from which {@link Main#pasteBuffer} data comes from.
-     * @deprecated During a copy operation, the layer should be added. See {@link OsmLayerTransferData}.
-     */
-    @Deprecated
-    public static Layer pasteSource;
-
-    /**
      * The MapFrame. Use {@link Main#setMapFrame} to set or clear it.
      * <p>
Index: trunk/src/org/openstreetmap/josm/data/osm/PrimitiveDeepCopy.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/PrimitiveDeepCopy.java	(revision 10686)
+++ 	(revision )
@@ -1,50 +1,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.data.osm;
-
-import java.awt.datatransfer.UnsupportedFlavorException;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.gui.datatransfer.ClipboardUtils;
-import org.openstreetmap.josm.gui.datatransfer.OsmTransferHandler;
-import org.openstreetmap.josm.gui.datatransfer.data.PrimitiveTransferData;
-
-/**
- * This class allows to create and keep a deep copy of primitives. Provides methods to access directly added
- * primitives and reference primitives
- * <p>
- * To be removed end of 2016
- * @since 2305
- * @deprecated This has been replaced by Swing Copy+Paste support. Use {@link OsmTransferHandler} instead.
- */
-@Deprecated
-public class PrimitiveDeepCopy {
-
-    /**
-     * Constructs a new {@code PrimitiveDeepCopy} without data.
-     */
-    public PrimitiveDeepCopy() {
-        // Do nothing
-    }
-
-    /**
-     * Gets the list of primitives that were explicitly added to this copy.
-     * @return The added primitives
-     */
-    public List<PrimitiveData> getDirectlyAdded() {
-        try {
-            PrimitiveTransferData data = (PrimitiveTransferData) ClipboardUtils.getClipboard().getData(PrimitiveTransferData.DATA_FLAVOR);
-            return new ArrayList<>(data.getDirectlyAdded());
-        } catch (UnsupportedFlavorException | IOException e) {
-            Main.debug(e);
-            return Collections.emptyList();
-        }
-    }
-
-    public boolean isEmpty() {
-        return !ClipboardUtils.getClipboard().isDataFlavorAvailable(PrimitiveTransferData.DATA_FLAVOR);
-    }
-}