diff --git a/qrenderdoc/Windows/BufferViewer.cpp b/qrenderdoc/Windows/BufferViewer.cpp
index d6000c662..924ec1cdd 100644
--- a/qrenderdoc/Windows/BufferViewer.cpp
+++ b/qrenderdoc/Windows/BufferViewer.cpp
@@ -1996,7 +1996,6 @@ void BufferViewer::configureMeshColumns()
       f.format.compCount = sig.compCount;
       f.format.compType = sig.compType;
       f.format.special = false;
-      f.format.rawType = 0;
       f.perinstance = false;
       f.instancerate = 1;
       f.rowmajor = false;
@@ -2063,7 +2062,6 @@ void BufferViewer::configureMeshColumns()
         f.format.compCount = sig.compCount;
         f.format.compType = sig.compType;
         f.format.special = false;
-        f.format.rawType = 0;
         f.perinstance = false;
         f.instancerate = 1;
         f.rowmajor = false;
diff --git a/renderdoc/api/replay/data_types.h b/renderdoc/api/replay/data_types.h
index 9ac94bc1d..c18f00f82 100644
--- a/renderdoc/api/replay/data_types.h
+++ b/renderdoc/api/replay/data_types.h
@@ -46,7 +46,6 @@ struct ResourceFormat
 {
   ResourceFormat()
   {
-    rawType = 0;
     special = true;
     specialFormat = SpecialFormat::Unknown;
 
@@ -67,8 +66,6 @@ struct ResourceFormat
   }
 
   bool operator!=(const ResourceFormat &r) const { return !(*this == r); }
-  uint32_t rawType;
-
   // indicates it's not a type represented with the members below
   // usually this means non-uniform across components or block compressed
   bool32 special;
diff --git a/renderdoc/core/replay_proxy.cpp b/renderdoc/core/replay_proxy.cpp
index 9c50fdf02..a8e52ed56 100644
--- a/renderdoc/core/replay_proxy.cpp
+++ b/renderdoc/core/replay_proxy.cpp
@@ -103,7 +103,6 @@ string ToStrHelper<false, ShaderBuiltin>::Get(const ShaderBuiltin &el)
 template <>
 void Serialiser::Serialise(const char *name, ResourceFormat &el)
 {
-  Serialise("", el.rawType);
   Serialise("", el.special);
   Serialise("", el.specialFormat);
   Serialise("", el.strname);
@@ -113,7 +112,7 @@ void Serialiser::Serialise(const char *name, ResourceFormat &el)
   Serialise("", el.bgraOrder);
   Serialise("", el.srgbCorrected);
 
-  SIZE_CHECK(56);
+  SIZE_CHECK(48);
 }
 
 template <>
@@ -310,7 +309,7 @@ void Serialiser::Serialise(const char *name, D3D11Pipe::Layout &el)
   Serialise("", el.PerInstance);
   Serialise("", el.InstanceDataStepRate);
 
-  SIZE_CHECK(96);
+  SIZE_CHECK(88);
 }
 
 template <>
@@ -349,7 +348,7 @@ void Serialiser::Serialise(const char *name, D3D11Pipe::View &el)
   Serialise("", el.ArraySize);
   Serialise("", el.FirstArraySlice);
 
-  SIZE_CHECK(136);
+  SIZE_CHECK(128);
 }
 
 template <>
@@ -468,7 +467,7 @@ void Serialiser::Serialise(const char *name, D3D11Pipe::OM &el)
   Serialise("", el.DepthReadOnly);
   Serialise("", el.StencilReadOnly);
 
-  SIZE_CHECK(424);
+  SIZE_CHECK(416);
 }
 
 template <>
@@ -488,7 +487,7 @@ void Serialiser::Serialise(const char *name, D3D11Pipe::State &el)
   Serialise("", el.m_RS);
   Serialise("", el.m_OM);
 
-  SIZE_CHECK(1768);
+  SIZE_CHECK(1760);
 }
 
 #pragma endregion D3D11 pipeline state
@@ -506,7 +505,7 @@ void Serialiser::Serialise(const char *name, D3D12Pipe::Layout &el)
   Serialise("", el.PerInstance);
   Serialise("", el.InstanceDataStepRate);
 
-  SIZE_CHECK(96);
+  SIZE_CHECK(88);
 }
 
 template <>
@@ -588,7 +587,7 @@ void Serialiser::Serialise(const char *name, D3D12Pipe::View &el)
 
   Serialise("", el.MinLODClamp);
 
-  SIZE_CHECK(184);
+  SIZE_CHECK(176);
 }
 
 template <>
@@ -683,7 +682,7 @@ void Serialiser::Serialise(const char *name, D3D12Pipe::OM &el)
   Serialise("", el.multiSampleCount);
   Serialise("", el.multiSampleQuality);
 
-  SIZE_CHECK(424);
+  SIZE_CHECK(416);
 }
 
 template <>
@@ -729,7 +728,7 @@ void Serialiser::Serialise(const char *name, D3D12Pipe::State &el)
 
   Serialise("", el.Resources);
 
-  SIZE_CHECK(1272);
+  SIZE_CHECK(1264);
 }
 
 #pragma endregion D3D12 pipeline state
@@ -745,7 +744,7 @@ void Serialiser::Serialise(const char *name, GLPipe::VertexAttribute &el)
   Serialise("", el.BufferSlot);
   Serialise("", el.RelativeOffset);
 
-  SIZE_CHECK(88);
+  SIZE_CHECK(80);
 }
 
 template <>
@@ -820,7 +819,7 @@ void Serialiser::Serialise(const char *name, GLPipe::ImageLoadStore &el)
   Serialise("", el.writeAllowed);
   Serialise("", el.Format);
 
-  SIZE_CHECK(88);
+  SIZE_CHECK(80);
 }
 
 template <>
@@ -1008,7 +1007,7 @@ void Serialiser::Serialise(const char *name, VKPipe::BindingElement &el)
   Serialise("", el.border);
   Serialise("", el.unnormalized);
 
-  SIZE_CHECK(328);
+  SIZE_CHECK(320);
 };
 
 template <>
@@ -1053,7 +1052,7 @@ void Serialiser::Serialise(const char *name, VKPipe::VertexAttribute &el)
   Serialise("", el.format);
   Serialise("", el.byteoffset);
 
-  SIZE_CHECK(72);
+  SIZE_CHECK(64);
 }
 
 template <>
@@ -1149,7 +1148,7 @@ void Serialiser::Serialise(const char *name, VKPipe::Attachment &el)
   Serialise("", el.numMip);
   Serialise("", el.numLayer);
 
-  SIZE_CHECK(104);
+  SIZE_CHECK(96);
 }
 
 template <>
@@ -1278,7 +1277,7 @@ void Serialiser::Serialise(const char *name, FetchTexture &el)
   Serialise("", el.msSamp);
   Serialise("", el.byteSize);
 
-  SIZE_CHECK(144);
+  SIZE_CHECK(136);
 }
 
 template <>
diff --git a/renderdoc/driver/dxgi/dxgi_common.cpp b/renderdoc/driver/dxgi/dxgi_common.cpp
index 83196df05..34acbf252 100644
--- a/renderdoc/driver/dxgi/dxgi_common.cpp
+++ b/renderdoc/driver/dxgi/dxgi_common.cpp
@@ -1488,7 +1488,6 @@ ResourceFormat MakeResourceFormat(DXGI_FORMAT fmt)
 {
   ResourceFormat ret;
 
-  ret.rawType = fmt;
   ret.special = false;
   ret.strname = ToStr::Get(fmt).substr(12);    // 12 == strlen("DXGI_FORMAT_")
 
diff --git a/renderdoc/driver/gl/gl_common.cpp b/renderdoc/driver/gl/gl_common.cpp
index cf22c241b..013fdcd38 100644
--- a/renderdoc/driver/gl/gl_common.cpp
+++ b/renderdoc/driver/gl/gl_common.cpp
@@ -1013,7 +1013,6 @@ ResourceFormat MakeResourceFormat(const GLHookSet &gl, GLenum target, GLenum fmt
 {
   ResourceFormat ret;
 
-  ret.rawType = (uint32_t)fmt;
   ret.special = false;
   ret.specialFormat = SpecialFormat::Unknown;
   ret.strname = ToStr::Get(fmt).substr(3);    // 3 == strlen("GL_")
diff --git a/renderdoc/driver/vulkan/vk_common.cpp b/renderdoc/driver/vulkan/vk_common.cpp
index b203b3e8f..5741b0622 100644
--- a/renderdoc/driver/vulkan/vk_common.cpp
+++ b/renderdoc/driver/vulkan/vk_common.cpp
@@ -148,7 +148,6 @@ ResourceFormat MakeResourceFormat(VkFormat fmt)
 {
   ResourceFormat ret;
 
-  ret.rawType = (uint32_t)fmt;
   ret.special = false;
   ret.specialFormat = SpecialFormat::Unknown;
   ret.strname = ToStr::Get(fmt).substr(10);    // 3 == strlen("VK_FORMAT_")
diff --git a/renderdocui/Interop/FetchInfo.cs b/renderdocui/Interop/FetchInfo.cs
index 583f62e88..706781c9a 100644
--- a/renderdocui/Interop/FetchInfo.cs
+++ b/renderdocui/Interop/FetchInfo.cs
@@ -112,7 +112,6 @@ namespace renderdoc
 
         public ResourceFormat()
         {
-            rawType = 0;
             special = false;
             specialFormat = SpecialFormat.Unknown;
 
@@ -127,7 +126,6 @@ namespace renderdoc
 
         public ResourceFormat(FormatComponentType type, UInt32 count, UInt32 byteWidth)
         {
-            rawType = 0;
             special = false;
             specialFormat = SpecialFormat.Unknown;
 
@@ -140,8 +138,6 @@ namespace renderdoc
             strname = "";
         }
 
-        public UInt32 rawType;
-
         // indicates it's not a type represented with the members below
         // usually this means non-uniform across components or block compressed
         public bool special;
diff --git a/renderdocui/Windows/BufferViewer.cs b/renderdocui/Windows/BufferViewer.cs
index bf7d9638d..1604d6949 100644
--- a/renderdocui/Windows/BufferViewer.cs
+++ b/renderdocui/Windows/BufferViewer.cs
@@ -975,7 +975,6 @@ namespace renderdocui.Windows
                     f[i].format.compCount = sig.compCount;
                     f[i].format.compType = sig.compType;
                     f[i].format.special = false;
-                    f[i].format.rawType = 0;
                     f[i].perinstance = false;
                     f[i].instancerate = 1;
                     f[i].rowmajor = false;