diff --git a/examples/common/entry/entry_sdl.cpp b/examples/common/entry/entry_sdl.cpp
index b73c88b04..cae5012b7 100644
--- a/examples/common/entry/entry_sdl.cpp
+++ b/examples/common/entry/entry_sdl.cpp
@@ -133,22 +133,6 @@ namespace entry
 		return GamepadAxis::Enum(s_translateGamepadAxis[_sdl]);
 	}
 
-	struct AxisDpadRemap
-	{
-		Key::Enum first;
-		Key::Enum second;
-	};
-
-	static AxisDpadRemap s_axisDpad[] =
-	{
-		{ Key::GamepadLeft, Key::GamepadRight },
-		{ Key::GamepadUp,   Key::GamepadDown  },
-		{ Key::None,        Key::None         },
-		{ Key::GamepadLeft, Key::GamepadRight },
-		{ Key::GamepadUp,   Key::GamepadDown  },
-		{ Key::None,        Key::None         },
-	};
-
 	struct GamepadSDL
 	{
 		GamepadSDL()
diff --git a/src/renderer_d3d11.cpp b/src/renderer_d3d11.cpp
index 7d6636ae9..09a28e032 100644
--- a/src/renderer_d3d11.cpp
+++ b/src/renderer_d3d11.cpp
@@ -6622,7 +6622,6 @@ namespace bgfx { namespace d3d11
 				}
 
 				tvm.printf(10, pos++, 0x8b, "      Indices: %7d ", statsNumIndices);
-//				tvm.printf(10, pos++, 0x8b, " Uniform size: %7d, Max: %7d ", _render->m_uniformEnd, _render->m_uniformMax);
 				tvm.printf(10, pos++, 0x8b, "     DVB size: %7d ", _render->m_vboffset);
 				tvm.printf(10, pos++, 0x8b, "     DIB size: %7d ", _render->m_iboffset);
 
diff --git a/src/renderer_d3d12.cpp b/src/renderer_d3d12.cpp
index d3d33369b..cf3f094c0 100644
--- a/src/renderer_d3d12.cpp
+++ b/src/renderer_d3d12.cpp
@@ -7391,7 +7391,6 @@ namespace bgfx { namespace d3d12
 				}
 
 				tvm.printf(10, pos++, 0x8b, "      Indices: %7d ", statsNumIndices);
-//				tvm.printf(10, pos++, 0x8b, " Uniform size: %7d, Max: %7d ", _render->m_uniformEnd, _render->m_uniformMax);
 				tvm.printf(10, pos++, 0x8b, "     DVB size: %7d ", _render->m_vboffset);
 				tvm.printf(10, pos++, 0x8b, "     DIB size: %7d ", _render->m_iboffset);
 
diff --git a/src/renderer_gl.cpp b/src/renderer_gl.cpp
index d480188a3..611c17a48 100644
--- a/src/renderer_gl.cpp
+++ b/src/renderer_gl.cpp
@@ -8711,7 +8711,6 @@ namespace bgfx { namespace gl
 				}
 
 				tvm.printf(10, pos++, 0x8b, "      Indices: %7d ", statsNumIndices);
-//				tvm.printf(10, pos++, 0x8b, " Uniform size: %7d, Max: %7d ", _render->m_uniformEnd, _render->m_uniformMax);
 				tvm.printf(10, pos++, 0x8b, "     DVB size: %7d ", _render->m_vboffset);
 				tvm.printf(10, pos++, 0x8b, "     DIB size: %7d ", _render->m_iboffset);
 
diff --git a/src/renderer_mtl.mm b/src/renderer_mtl.mm
index 5b15ce690..3deeea300 100644
--- a/src/renderer_mtl.mm
+++ b/src/renderer_mtl.mm
@@ -5444,7 +5444,6 @@ BX_STATIC_ASSERT(BX_COUNTOF(s_accessNames) == Access::Count, "Invalid s_accessNa
 				}
 
 				tvm.printf(10, pos++, 0x8b, "      Indices: %7d ", statsNumIndices);
-//				tvm.printf(10, pos++, 0x8b, " Uniform size: %7d, Max: %7d ", _render->m_uniformEnd, _render->m_uniformMax);
 				tvm.printf(10, pos++, 0x8b, "     DVB size: %7d ", _render->m_vboffset);
 				tvm.printf(10, pos++, 0x8b, "     DIB size: %7d ", _render->m_iboffset);
 
diff --git a/src/renderer_vk.cpp b/src/renderer_vk.cpp
index 8e909964d..c12f35936 100644
--- a/src/renderer_vk.cpp
+++ b/src/renderer_vk.cpp
@@ -2800,13 +2800,6 @@ VK_IMPORT_DEVICE
 				return suspended;
 			}
 
-			//BX_TRACE("updateResolution(%d, %d) m_resolution=(%d, %d)"
-			//	, _resolution.width
-			//	, _resolution.height
-			//	, m_resolution.width
-			//	, m_resolution.height
-			//	);
-
 			uint32_t flags = _resolution.reset & ~(0
 				| BGFX_RESET_SUSPEND
 				| BGFX_RESET_MAXANISOTROPY
@@ -5136,8 +5129,6 @@ VK_DESTROY
 		smci.codeSize = m_code->size;
 		smci.pCode    = (const uint32_t*)m_code->data;
 
-//		disassemble(bx::getDebugOut(), m_code->data, m_code->size);
-
 		VK_CHECK(vkCreateShaderModule(
 			  s_renderVK->m_device
 			, &smci
@@ -9438,7 +9429,6 @@ VK_DESTROY
 				}
 
 				tvm.printf(10, pos++, 0x8b, "      Indices: %7d ", statsNumIndices);
-//				tvm.printf(10, pos++, 0x8b, " Uniform size: %7d, Max: %7d ", _render->m_uniformEnd, _render->m_uniformMax);
 				tvm.printf(10, pos++, 0x8b, "     DVB size: %7d ", _render->m_vboffset);
 				tvm.printf(10, pos++, 0x8b, "     DIB size: %7d ", _render->m_iboffset);