--- dyld/dyld-1340/cache_builder/Chunk.cpp
+++ dyld/dyld-1042.1/cache_builder/Chunk.cpp
@@ -68,9 +68,6 @@
             // FIXME: Not sure why this is 16.  Seems like 8 would be sufficient.
             nlist       = 16,
 
-            // This chunk points to data which contains a uint128_t or similar, so needs 128-bit alignment
-            struct128   = 16,
-
             // Inside the cache there is minimal overhead for 16K alignment even on 4K hardware
             page        = 16*1024,
         };
@@ -115,27 +112,22 @@
     return nullptr;
 }
 
-const AlignChunk* Chunk::isAlignChunk() const
+const DylibSegmentChunk* Chunk::isDylibSegmentChunk() const
 {
     return nullptr;
 }
 
-const DylibSegmentChunk* Chunk::isDylibSegmentChunk() const
+const LinkeditDataChunk* Chunk::isLinkeditDataChunk() const
 {
     return nullptr;
 }
 
-const LinkeditDataChunk* Chunk::isLinkeditDataChunk() const
+StubsChunk* Chunk::isStubsChunk()
 {
     return nullptr;
 }
 
-StubsChunk* Chunk::isStubsChunk()
-{
-    return nullptr;
-}
-
-const DylibSegmentChunk* Chunk::isTPROChunk() const
+UniquedGOTsChunk* Chunk::isUniquedGOTsChunk()
 {
     return nullptr;
 }
@@ -271,30 +263,6 @@
 }
 
 //
-// MARK: --- ObjCImageInfoChunk methods ---
-//
-
-ObjCImageInfoChunk::ObjCImageInfoChunk()
-    : Chunk(Kind::objcHeaderInfoRO, Alignment::struct64)
-{
-}
-
-ObjCImageInfoChunk::~ObjCImageInfoChunk()
-{
-
-}
-
-void ObjCImageInfoChunk::dump() const
-{
-    printf("ObjCImageInfoChunk\n");
-}
-
-const char* ObjCImageInfoChunk::name() const
-{
-    return "objc image info";
-}
-
-//
 // MARK: --- ObjCHeaderInfoReadOnlyChunk methods ---
 //
 
@@ -463,30 +431,6 @@
 }
 
 //
-// MARK: --- PointerHashTableChunk methods ---
-//
-
-PointerHashTableChunk::PointerHashTableChunk()
-    : Chunk(Kind::pointerHashTable, Alignment::struct64)
-{
-}
-
-PointerHashTableChunk::~PointerHashTableChunk()
-{
-
-}
-
-void PointerHashTableChunk::dump() const
-{
-    printf("PointerHashTableChunk\n");
-}
-
-const char* PointerHashTableChunk::name() const
-{
-    return "pointer hash table";
-}
-
-//
 // MARK: --- ObjCProtocolHashTableChunk methods ---
 //
 
@@ -533,30 +477,6 @@
 {
     return "objc canonical protocols";
 }
-//
-// MARK: --- ObjCCategoriesChunk methods ---
-//
-
-ObjCPreAttachedCategoriesChunk::ObjCPreAttachedCategoriesChunk()
-    : SlidChunk(Kind::objcPreAttachedCategories, (uint64_t)Alignment::struct64)
-{
-}
-
-ObjCPreAttachedCategoriesChunk::~ObjCPreAttachedCategoriesChunk()
-{
-
-}
-
-void ObjCPreAttachedCategoriesChunk::dump() const
-{
-    printf("ObjCPreAttachedCategoriesChunk\n");
-}
-
-const char* ObjCPreAttachedCategoriesChunk::name() const
-{
-    return "objc pre-attached categories";
-}
-
 
 //
 // MARK: --- ObjCIMPCachesChunk methods ---
@@ -630,37 +550,12 @@
     return "cache patch table";
 }
 
-
-//
-// MARK: --- FunctionVariantsPatchTableChunk methods ---
-//
-
-FunctionVariantsPatchTableChunk::FunctionVariantsPatchTableChunk()
-: Chunk(Kind::cacheFunctionVariantsPatchTable, Alignment::struct64)
-{
-}
-
-FunctionVariantsPatchTableChunk::~FunctionVariantsPatchTableChunk()
-{
-}
-
-void FunctionVariantsPatchTableChunk::dump() const
-{
-    printf("FunctionVariantsPatchTableChunk\n");
-}
-
-const char* FunctionVariantsPatchTableChunk::name() const
-{
-    return "function variants table";
-}
-
-
 //
 // MARK: --- PrebuiltLoaderChunk methods ---
 //
 
 PrebuiltLoaderChunk::PrebuiltLoaderChunk(Kind kind)
-    : Chunk(kind, Alignment::struct128)
+    : Chunk(kind, Alignment::struct64)
 {
 }
 
@@ -730,13 +625,6 @@
 const DylibSegmentChunk* DylibSegmentChunk::isDylibSegmentChunk() const
 {
     return this;
-}
-
-const DylibSegmentChunk* DylibSegmentChunk::isTPROChunk() const
-{
-    if ( this->kind == Kind::tproDataConst )
-        return this;
-    return nullptr;
 }
 
 //
@@ -775,10 +663,7 @@
             chunkName = "linkedit function starts";
             break;
         case Chunk::Kind::linkeditDataInCode:
-            chunkName = "linkedit data-in-code";
-            break;
-        case Chunk::Kind::linkeditFunctionVariants  :
-            chunkName = "linkedit function-variants-table";
+            chunkName = "linkedit Mr Data (in code)";
             break;
         case Chunk::Kind::linkeditExportTrie:
             chunkName = "linkedit export trie";
@@ -810,12 +695,6 @@
     return this->kind == Chunk::Kind::linkeditSymbolStrings;
 }
 
-bool LinkeditDataChunk::isFunctionVariantsTable() const
-{
-    return this->kind == Chunk::Kind::linkeditFunctionVariants;
-}
-
-
 //
 // MARK: --- NListChunk methods ---
 //
@@ -886,6 +765,11 @@
 const char* UniquedGOTsChunk::name() const
 {
     return "uniqued GOTs";
+}
+
+UniquedGOTsChunk* UniquedGOTsChunk::isUniquedGOTsChunk()
+{
+    return this;
 }
 
 //
@@ -947,58 +831,3 @@
 {
     return true;
 }
-
-//
-// MARK: --- AlignChunk methods ---
-//
-
-AlignChunk::AlignChunk()
-    : Chunk(Kind::align, Alignment::page)
-{
-    // This never has a size so just set it now
-    this->cacheVMSize = CacheVMSize(0ULL);
-    this->subCacheFileSize = CacheFileSize(0ULL);
-}
-
-AlignChunk::~AlignChunk()
-{
-
-}
-
-void AlignChunk::dump() const
-{
-    printf("AlignChunk\n");
-}
-
-const char* AlignChunk::name() const
-{
-    return "align";
-}
-
-const AlignChunk* AlignChunk::isAlignChunk() const {
-    return this;
-}
-
-//
-// MARK: --- PrewarmingChunk methods ---
-//
-
-PrewarmingChunk::PrewarmingChunk(Kind kind)
-    : Chunk(kind, Alignment::uleb)
-{
-}
-
-PrewarmingChunk::~PrewarmingChunk()
-{
-
-}
-
-void PrewarmingChunk::dump() const
-{
-    printf("PrewarmingChunk\n");
-}
-
-const char* PrewarmingChunk::name() const
-{
-    return "prewarming data";
-}