Index: trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java	(revision 19328)
+++ trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java	(revision 19330)
@@ -310,10 +310,4 @@
     }
 
-    @Deprecated(since = "17749")
-    @Override
-    public void setTimestamp(Date timestamp) {
-        this.timestamp = (int) TimeUnit.MILLISECONDS.toSeconds(timestamp.getTime());
-    }
-
     @Override
     public void setInstant(Instant timestamp) {
@@ -324,10 +318,4 @@
     public void setRawTimestamp(int timestamp) {
         this.timestamp = timestamp;
-    }
-
-    @Deprecated(since = "17749")
-    @Override
-    public Date getTimestamp() {
-        return Date.from(getInstant());
     }
 
Index: trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java	(revision 19328)
+++ trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java	(revision 19330)
@@ -300,16 +300,4 @@
     }
 
-    @Deprecated(since = "17749", forRemoval = true)
-    @Override
-    public void setTimestamp(Date timestamp) {
-        checkDatasetNotReadOnly();
-        boolean locked = writeLock();
-        try {
-            super.setTimestamp(timestamp);
-        } finally {
-            writeUnlock(locked);
-        }
-    }
-
     /* -------
     /* FLAGS