diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Mutation.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Mutation.java
index 8bfdf891d6b3..a561632960a0 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Mutation.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Mutation.java
@@ -301,19 +301,6 @@ public Durability getDurability() {
     return this.familyMap;
   }
 
-  /**
-   * Method for setting the mutation's familyMap
-   * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0.
-   *             Use {@link Mutation#Mutation(byte[], long, NavigableMap)} instead
-   */
-  @Deprecated
-  public Mutation setFamilyCellMap(NavigableMap<byte [], List<Cell>> map) {
-    // TODO: Shut this down or move it up to be a Constructor.  Get new object rather than change
-    // this internal data member.
-    this.familyMap = map;
-    return this;
-  }
-
   /**
    * Method to check if the familyMap is empty
    * @return true if empty, false otherwise
@@ -341,17 +328,6 @@ public int compareTo(final Row d) {
     return Bytes.compareTo(this.getRow(), d.getRow());
   }
 
-  /**
-   * Method for retrieving the timestamp
-   * @return timestamp
-   * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0.
-   *             Use {@link #getTimestamp()} instead
-   */
-  @Deprecated
-  public long getTimeStamp() {
-    return this.getTimestamp();
-  }
-
   /**
    * Method for retrieving the timestamp.
    *
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Put.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Put.java
index 90db12c4f7ac..21f22d184730 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Put.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Put.java
@@ -249,17 +249,6 @@ public Put setDurability(Durability d) {
     return (Put) super.setDurability(d);
   }
 
-  /**
-   * Method for setting the put's familyMap
-   * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0.
-   *             Use {@link Put#Put(byte[], long, NavigableMap)} instead
-   */
-  @Deprecated
-  @Override
-  public Put setFamilyCellMap(NavigableMap<byte[], List<Cell>> map) {
-    return (Put) super.setFamilyCellMap(map);
-  }
-
   @Override
   public Put setClusterIds(List<UUID> clusterIds) {
     return (Put) super.setClusterIds(clusterIds);
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALSplitUtil.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALSplitUtil.java
index b9ccc496fe1f..3aba3095c232 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALSplitUtil.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALSplitUtil.java
@@ -45,6 +45,7 @@
 import org.apache.hadoop.hbase.client.Mutation;
 import org.apache.hadoop.hbase.client.Put;
 import org.apache.hadoop.hbase.client.RegionInfo;
+import org.apache.hadoop.hbase.client.Row;
 import org.apache.hadoop.hbase.regionserver.HRegion;
 import org.apache.hadoop.hbase.regionserver.wal.AbstractFSWAL;
 import org.apache.hadoop.hbase.util.Bytes;
@@ -453,7 +454,7 @@ public MutationReplay(ClientProtos.MutationProto.MutationType type, Mutation mut
 
     @Override
     public int compareTo(final MutationReplay d) {
-      return this.mutation.compareTo(d.mutation);
+      return Row.COMPARATOR.compare(mutation, d.mutation);
     }
 
     @Override
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestSerialReplicationChecker.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestSerialReplicationChecker.java
index 29749bdc67bf..cebe942cf434 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestSerialReplicationChecker.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestSerialReplicationChecker.java
@@ -157,7 +157,7 @@ private void addStateAndBarrier(RegionInfo region, RegionState.State state, long
     }
     for (int i = 0; i < barriers.length; i++) {
       put.addColumn(HConstants.REPLICATION_BARRIER_FAMILY, HConstants.SEQNUM_QUALIFIER,
-        put.getTimeStamp() - barriers.length + i, Bytes.toBytes(barriers[i]));
+        put.getTimestamp() - barriers.length + i, Bytes.toBytes(barriers[i]));
     }
     try (Table table = UTIL.getConnection().getTable(TableName.META_TABLE_NAME)) {
       table.put(put);
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsckCleanReplicationBarriers.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsckCleanReplicationBarriers.java
index 375f2ed4bc9a..21ad20c0568b 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsckCleanReplicationBarriers.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsckCleanReplicationBarriers.java
@@ -189,7 +189,7 @@ private void addStateAndBarrier(RegionInfo region, RegionState.State state, long
     }
     for (int i = 0; i < barriers.length; i++) {
       put.addColumn(HConstants.REPLICATION_BARRIER_FAMILY, HConstants.SEQNUM_QUALIFIER,
-        put.getTimeStamp() - barriers.length + i, Bytes.toBytes(barriers[i]));
+        put.getTimestamp() - barriers.length + i, Bytes.toBytes(barriers[i]));
     }
     try (Table table = UTIL.getConnection().getTable(TableName.META_TABLE_NAME)) {
       table.put(put);