diff --git a/db/db_impl/db_impl_compaction_flush.cc b/db/db_impl/db_impl_compaction_flush.cc
index 1db619f86f6..04672191d34 100644
--- a/db/db_impl/db_impl_compaction_flush.cc
+++ b/db/db_impl/db_impl_compaction_flush.cc
@@ -1907,9 +1907,6 @@ Status DBImpl::ReFitLevel(ColumnFamilyData* cfd, int level, int target_level) {
     cfd->compaction_picker()->UnregisterCompaction(c.get());
     c.reset();
 
-    cfd->compaction_picker()->UnregisterCompaction(c.get());
-    c.reset();
-
     InstallSuperVersionAndScheduleWork(cfd, &sv_context, mutable_cf_options);
 
     ROCKS_LOG_DEBUG(immutable_db_options_.info_log, "[%s] LogAndApply: %s\n",
diff --git a/tools/dump/db_dump_tool.cc b/tools/dump/db_dump_tool.cc
index 901efc8f888..e234c9a733d 100644
--- a/tools/dump/db_dump_tool.cc
+++ b/tools/dump/db_dump_tool.cc
@@ -4,8 +4,6 @@
 //  (found in the LICENSE.Apache file in the root directory).
 
 
-#include "rocksdb/db_dump_tool.h"
-
 #include "rocksdb/db_dump_tool.h"
 
 #include <cinttypes>
diff --git a/utilities/compaction_filters/remove_emptyvalue_compactionfilter.cc b/utilities/compaction_filters/remove_emptyvalue_compactionfilter.cc
index 0a0c585f889..c61ce022042 100644
--- a/utilities/compaction_filters/remove_emptyvalue_compactionfilter.cc
+++ b/utilities/compaction_filters/remove_emptyvalue_compactionfilter.cc
@@ -4,8 +4,6 @@
 //  (found in the LICENSE.Apache file in the root directory).
 
 
-#include "utilities/compaction_filters/remove_emptyvalue_compactionfilter.h"
-
 #include "utilities/compaction_filters/remove_emptyvalue_compactionfilter.h"
 
 #include <string>