diff --git a/src/gfxstream/codegen/scripts/cereal/decoder.py b/src/gfxstream/codegen/scripts/cereal/decoder.py
index 6396fffc835..638629dc12c 100644
--- a/src/gfxstream/codegen/scripts/cereal/decoder.py
+++ b/src/gfxstream/codegen/scripts/cereal/decoder.py
@@ -565,11 +565,9 @@ def decode_vkFlushMappedMemoryRanges(typeInfo: VulkanTypeInfo, api, cgen):
     cgen.beginIf("m_prevSeqno")
     cgen.stmt("m_prevSeqno = m_prevSeqno.value() - 1")
     cgen.endIf()
-    cgen.stmt("return ptr - (unsigned char*)buf;")
+    cgen.stmt("return ptr - (unsigned char*)buf")
     cgen.endIf()
-    cgen.stmt("auto range = pMemoryRanges[i]")
     cgen.stmt("auto memory = pMemoryRanges[i].memory")
-    cgen.stmt("auto size = pMemoryRanges[i].size")
     cgen.stmt("auto offset = pMemoryRanges[i].offset")
     cgen.stmt("uint64_t readStream = 0")
     cgen.stmt("memcpy(&readStream, *readStreamPtrPtr, sizeof(uint64_t)); *readStreamPtrPtr += sizeof(uint64_t)")
@@ -581,7 +579,7 @@ def decode_vkFlushMappedMemoryRanges(typeInfo: VulkanTypeInfo, api, cgen):
     cgen.beginIf("m_prevSeqno")
     cgen.stmt("m_prevSeqno = m_prevSeqno.value() - 1")
     cgen.endIf()
-    cgen.stmt("return ptr - (unsigned char*)buf;")
+    cgen.stmt("return ptr - (unsigned char*)buf")
     cgen.endIf()
     cgen.stmt("sizeLeft -= readStream")
     cgen.stmt("uint8_t* targetRange = hostPtr + offset")