diff --git a/src/gfxstream/codegen/scripts/cereal/functable.py b/src/gfxstream/codegen/scripts/cereal/functable.py
index 21194e26d6b..a707d274c57 100644
--- a/src/gfxstream/codegen/scripts/cereal/functable.py
+++ b/src/gfxstream/codegen/scripts/cereal/functable.py
@@ -137,9 +137,8 @@ HANDLES_TRANSLATE = {
     "VkCommandBuffer",
     "VkFence",
     "VkSemaphore",
-    # TODO: What part of WSI needs Mesa object backings for VkImage/VkBuffer?
+    # TODO: Still need this translation to avoid descriptorSets crash
     "VkBuffer",
-    "VkImage",
 }
 
 # Types that have a corresponding method for transforming
diff --git a/src/gfxstream/guest/vulkan/gfxstream_vk_device.cpp b/src/gfxstream/guest/vulkan/gfxstream_vk_device.cpp
index 164626f67f1..617f902f0aa 100644
--- a/src/gfxstream/guest/vulkan/gfxstream_vk_device.cpp
+++ b/src/gfxstream/guest/vulkan/gfxstream_vk_device.cpp
@@ -654,10 +654,6 @@ VkResult gfxstream_vk_AllocateMemory(VkDevice device, const VkMemoryAllocateInfo
             VK_FROM_HANDLE(gfxstream_vk_buffer, gfxstream_buffer, dedicatedAllocInfoPtr->buffer);
             dedicatedAllocInfoPtr->buffer = gfxstream_buffer->internal_object;
         }
-        if (dedicatedAllocInfoPtr->image) {
-            VK_FROM_HANDLE(gfxstream_vk_image, gfxstream_image, dedicatedAllocInfoPtr->image);
-            dedicatedAllocInfoPtr->image = gfxstream_image->internal_object;
-        }
     }
     {
         auto vkEnc = gfxstream::vk::ResourceTracker::getThreadLocalEncoder();
diff --git a/src/gfxstream/guest/vulkan_enc/gfxstream_vk_private.h b/src/gfxstream/guest/vulkan_enc/gfxstream_vk_private.h
index 4e95a2348f6..6e89a51dc0f 100644
--- a/src/gfxstream/guest/vulkan_enc/gfxstream_vk_private.h
+++ b/src/gfxstream/guest/vulkan_enc/gfxstream_vk_private.h
@@ -101,11 +101,6 @@ struct gfxstream_vk_command_buffer {
     VkCommandBuffer internal_object;
 };
 
-struct gfxstream_vk_image {
-    struct vk_image vk;
-    VkImage internal_object;
-};
-
 struct gfxstream_vk_fence {
     struct vk_fence vk;
     VkFence internal_object;
@@ -127,7 +122,6 @@ VK_DEFINE_HANDLE_CASTS(gfxstream_vk_queue, vk.base, VkQueue, VK_OBJECT_TYPE_QUEU
 VK_DEFINE_NONDISP_HANDLE_CASTS(gfxstream_vk_command_pool, vk.base, VkCommandPool,
                                VK_OBJECT_TYPE_COMMAND_POOL)
 VK_DEFINE_NONDISP_HANDLE_CASTS(gfxstream_vk_buffer, vk.base, VkBuffer, VK_OBJECT_TYPE_BUFFER)
-VK_DEFINE_NONDISP_HANDLE_CASTS(gfxstream_vk_image, vk.base, VkImage, VK_OBJECT_TYPE_IMAGE)
 VK_DEFINE_NONDISP_HANDLE_CASTS(gfxstream_vk_fence, vk.base, VkFence, VK_OBJECT_TYPE_FENCE)
 VK_DEFINE_NONDISP_HANDLE_CASTS(gfxstream_vk_semaphore, vk.base, VkSemaphore,
                                VK_OBJECT_TYPE_SEMAPHORE)