diff --git a/iocore/cache/CacheDir.cc b/iocore/cache/CacheDir.cc
index f1f515a3c89..b82b88555cf 100644
--- a/iocore/cache/CacheDir.cc
+++ b/iocore/cache/CacheDir.cc
@@ -54,7 +54,6 @@
 // Globals
 
 ClassAllocator<OpenDirEntry> openDirEntryAllocator("openDirEntry");
-Dir empty_dir;
 
 // OpenDir
 
diff --git a/iocore/cache/P_CacheDir.h b/iocore/cache/P_CacheDir.h
index 18450935e0e..fc99f443e8d 100644
--- a/iocore/cache/P_CacheDir.h
+++ b/iocore/cache/P_CacheDir.h
@@ -111,7 +111,6 @@ struct CacheVC;
 #define OPEN_DIR_BUCKETS 256
 
 struct EvacuationBlock;
-using DirInfo = uint32_t;
 
 // Cache Directory
 
@@ -143,23 +142,6 @@ struct Dir {
 #endif
 };
 
-// INTERNAL: do not access these members directly, use the
-// accessors below (e.g. dir_offset, dir_set_offset)
-struct FreeDir {
-#if DO_NOT_REMOVE_THIS
-  // THE BIT-FIELD INTERPRETATION OF THIS STRUCT WHICH HAS TO
-  // USE MACROS TO PREVENT UNALIGNED LOADS
-  unsigned int offset      : 24; // 0: empty
-  unsigned int reserved    : 8;
-  unsigned int prev        : 16; // (2)
-  unsigned int next        : 16; // (3)
-  unsigned int offset_high : 16; // 0: empty
-#else
-  uint16_t w[5];
-  FreeDir() { dir_clear(this); }
-#endif
-};
-
 #define dir_offset(_e) \
   ((int64_t)(((uint64_t)(_e)->w[0]) | (((uint64_t)((_e)->w[1] & 0xFF)) << 16) | (((uint64_t)(_e)->w[4]) << 24)))
 #define dir_set_offset(_e, _o)                                              \
@@ -296,10 +278,6 @@ int dir_segment_accounted(int s, Vol *d, int offby = 0, int *free = nullptr, int
 uint64_t dir_entries_used(Vol *d);
 void sync_cache_dir_on_shutdown();
 
-// Global Data
-
-extern Dir empty_dir;
-
 // Inline Functions
 
 #define dir_in_seg(_s, _i) ((Dir *)(((char *)(_s)) + (SIZEOF_DIR * (_i))))