diff --git a/renderdoc/driver/vulkan/vk_core.cpp b/renderdoc/driver/vulkan/vk_core.cpp
index f1cbc6915..3fb014fa0 100644
--- a/renderdoc/driver/vulkan/vk_core.cpp
+++ b/renderdoc/driver/vulkan/vk_core.cpp
@@ -450,7 +450,10 @@ void WrappedVulkan::SubmitSemaphores()
 void WrappedVulkan::FlushQ()
 {
 	// VKTODOLOW could do away with the need for this function by keeping
-	// commands until N presents later, or something, or checking on fences
+	// commands until N presents later, or something, or checking on fences.
+	// If we do so, then check each use for FlushQ to see if it needs a
+	// CPU-GPU sync or whether it is just looking to recycle command buffers
+	// (Particularly the one in vkQueuePresentKHR drawing the overlay)
 
 	ObjDisp(m_Queue)->QueueWaitIdle(Unwrap(m_Queue));
 
diff --git a/renderdoc/driver/vulkan/vk_debug.cpp b/renderdoc/driver/vulkan/vk_debug.cpp
index 03074c65d..1aac15b4c 100644
--- a/renderdoc/driver/vulkan/vk_debug.cpp
+++ b/renderdoc/driver/vulkan/vk_debug.cpp
@@ -238,7 +238,6 @@ string VulkanDebugManager::GetSPIRVBlob(SPIRVShaderStage shadType, const std::ve
 
 VulkanDebugManager::VulkanDebugManager(WrappedVulkan *driver, VkDevice dev)
 {
-	// VKTODOLOW needs tidy up - isn't scalable. Needs more classes like UBO above.
 	m_pDriver = driver;
 	m_State = m_pDriver->GetState();
 
diff --git a/renderdoc/driver/vulkan/vk_debug.h b/renderdoc/driver/vulkan/vk_debug.h
index 6856775d3..92dd5fbf7 100644
--- a/renderdoc/driver/vulkan/vk_debug.h
+++ b/renderdoc/driver/vulkan/vk_debug.h
@@ -152,7 +152,6 @@ class VulkanDebugManager
 			VulkanResourceManager *m_ResourceManager;
 		};
 
-		// VKTODOLOW make this all private/wrapped up
 		VkDescriptorPool m_DescriptorPool;
 		VkSampler m_LinearSampler, m_PointSampler;
 
diff --git a/renderdoc/driver/vulkan/wrappers/vk_wsi_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_wsi_funcs.cpp
index 7731f2742..b60dc3827 100644
--- a/renderdoc/driver/vulkan/wrappers/vk_wsi_funcs.cpp
+++ b/renderdoc/driver/vulkan/wrappers/vk_wsi_funcs.cpp
@@ -623,8 +623,6 @@ VkResult WrappedVulkan::vkQueuePresentKHR(
 
 			SubmitCmds();
 
-			// VKTODOLOW once we have a more sophisticated way of re-using submitted command
-			// buffers once they've executed and are safe to recycle, this can be removed
 			FlushQ();
 		}
 	}