diff --git a/.pick_status.json b/.pick_status.json
index 0988e69b7c2..edde92aa197 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -334,7 +334,7 @@
         "description": "gfxstream: drop dead variables",
         "nominated": false,
         "nomination_type": 0,
-        "resolution": 4,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/gfxstream/codegen/scripts/cereal/counting.py b/src/gfxstream/codegen/scripts/cereal/counting.py
index 8df2570f94d..f0b610a28fd 100644
--- a/src/gfxstream/codegen/scripts/cereal/counting.py
+++ b/src/gfxstream/codegen/scripts/cereal/counting.py
@@ -372,7 +372,6 @@ class VulkanCountingCodegen(VulkanTypeIterator):
         if lenAccessGuard is not None:
             self.cgen.beginIf(lenAccessGuard)
         self.cgen.beginFor("uint32_t i = 0", "i < %s" % lenAccess, "++i")
-        self.cgen.stmt("size_t l = %s[i] ? strlen(%s[i]) : 0" % (access, access))
         self.genCount("sizeof(uint32_t) + (%s[i] ? strlen(%s[i]) : 0)" % (access, access))
         self.cgen.endFor()
         if lenAccessGuard is not None:
diff --git a/src/gfxstream/codegen/scripts/cereal/encoder.py b/src/gfxstream/codegen/scripts/cereal/encoder.py
index af378b50078..c181de79d7a 100644
--- a/src/gfxstream/codegen/scripts/cereal/encoder.py
+++ b/src/gfxstream/codegen/scripts/cereal/encoder.py
@@ -367,7 +367,6 @@ def emit_parameter_encode_write_packet_info(typeInfo, api, cgen):
         cgen.stmt("if (queueSubmitWithCommandsEnabled) packetSize_%s -= 8" % api.name)
 
     cgen.stmt("uint8_t* streamPtr = %s->reserve(packetSize_%s)" % (STREAM, api.name))
-    cgen.stmt("uint8_t* packetBeginPtr = streamPtr")
     cgen.stmt("uint8_t** streamPtrPtr = &streamPtr")
     cgen.stmt("uint32_t opcode_%s = OP_%s" % (api.name, api.name))
 
diff --git a/src/gfxstream/guest/vulkan_enc/vkQueueFlushCommandsGOOGLE_encode_impl.cpp.inl b/src/gfxstream/guest/vulkan_enc/vkQueueFlushCommandsGOOGLE_encode_impl.cpp.inl
index 25803113a6d..1c878fa6b2d 100644
--- a/src/gfxstream/guest/vulkan_enc/vkQueueFlushCommandsGOOGLE_encode_impl.cpp.inl
+++ b/src/gfxstream/guest/vulkan_enc/vkQueueFlushCommandsGOOGLE_encode_impl.cpp.inl
@@ -18,9 +18,7 @@ local_pData = (void*)pData;
 size_t count = 0;
 size_t* countPtr = &count;
 {
-    uint64_t cgen_var_1405;
     *countPtr += 1 * 8;
-    uint64_t cgen_var_1406;
     *countPtr += 1 * 8;
     *countPtr += sizeof(VkDeviceSize);
     *countPtr += ((dataSize)) * sizeof(uint8_t);
@@ -28,7 +26,6 @@ size_t* countPtr = &count;
 bool queueSubmitWithCommandsEnabled = sFeatureBits & VULKAN_STREAM_FEATURE_QUEUE_SUBMIT_WITH_COMMANDS_BIT;
 uint32_t packetSize_vkQueueFlushCommandsGOOGLE = 4 + 4 + (queueSubmitWithCommandsEnabled ? 4 : 0) + count;
 uint8_t* streamPtr = stream->reserve(packetSize_vkQueueFlushCommandsGOOGLE - local_dataSize);
-uint8_t* packetBeginPtr = streamPtr;
 uint8_t** streamPtrPtr = &streamPtr;
 uint32_t opcode_vkQueueFlushCommandsGOOGLE = OP_vkQueueFlushCommandsGOOGLE;
 uint32_t seqno = ResourceTracker::nextSeqno();