diff --git a/src/Cafe/HW/Latte/Renderer/Metal/LatteToMtl.cpp b/src/Cafe/HW/Latte/Renderer/Metal/LatteToMtl.cpp
index 477213350..249614345 100644
--- a/src/Cafe/HW/Latte/Renderer/Metal/LatteToMtl.cpp
+++ b/src/Cafe/HW/Latte/Renderer/Metal/LatteToMtl.cpp
@@ -84,7 +84,6 @@ std::map<Latte::E_GX2SURFFMT, MetalPixelFormatInfo> MTL_DEPTH_FORMAT_TABLE = {
 	{Latte::E_GX2SURFFMT::D32_FLOAT, {MTL::PixelFormatDepth32Float, MetalDataType::NONE, 4, {1, 1}}},
 };
 
-// TODO: change the decoders when a format is not supported
 // TODO: R10_G10_B10_A2_UINT and R10_G10_B10_A2_SINT
 // TODO: A2_B10_G10_R10_UNORM and A2_B10_G10_R10_UINT
 void CheckForPixelFormatSupport(const MetalPixelFormatSupport& support)
diff --git a/src/Cafe/HW/Latte/Renderer/Metal/MetalDepthStencilCache.cpp b/src/Cafe/HW/Latte/Renderer/Metal/MetalDepthStencilCache.cpp
index 96375e0bf..427530c2c 100644
--- a/src/Cafe/HW/Latte/Renderer/Metal/MetalDepthStencilCache.cpp
+++ b/src/Cafe/HW/Latte/Renderer/Metal/MetalDepthStencilCache.cpp
@@ -54,8 +54,6 @@ MTL::DepthStencilState* MetalDepthStencilCache::GetDepthStencilState(const Latte
     	uint32 stencilWriteMaskBack = LatteGPUState.contextNew.DB_STENCILREFMASK_BF.get_STENCILWRITEMASK_B();
 
     	MTL::StencilDescriptor* frontStencil = MTL::StencilDescriptor::alloc()->init();
-    	// TODO: set reference
-    	//depthStencilState.front.reference = stencilRefFront;
     	frontStencil->setReadMask(stencilCompareMaskFront);
     	frontStencil->setWriteMask(stencilWriteMaskFront);
     	frontStencil->setStencilCompareFunction(GetMtlCompareFunc(frontStencilFunc));
@@ -67,8 +65,6 @@ MTL::DepthStencilState* MetalDepthStencilCache::GetDepthStencilState(const Latte
     	MTL::StencilDescriptor* backStencil = MTL::StencilDescriptor::alloc()->init();
     	if (backStencilEnable)
     	{
-           	// TODO: set reference
-           	//depthStencilState.back.reference = stencilRefBack;
            	backStencil->setReadMask(stencilCompareMaskBack);
            	backStencil->setWriteMask(stencilWriteMaskBack);
            	backStencil->setStencilCompareFunction(GetMtlCompareFunc(backStencilFunc));
@@ -78,8 +74,6 @@ MTL::DepthStencilState* MetalDepthStencilCache::GetDepthStencilState(const Latte
     	}
     	else
     	{
-    	    // TODO: set reference
-           	//depthStencilState.back.reference = stencilRefFront;
            	backStencil->setReadMask(stencilCompareMaskFront);
            	backStencil->setWriteMask(stencilWriteMaskFront);
            	backStencil->setStencilCompareFunction(GetMtlCompareFunc(frontStencilFunc));
diff --git a/src/Cafe/HW/Latte/Renderer/Metal/MetalPipelineCache.cpp b/src/Cafe/HW/Latte/Renderer/Metal/MetalPipelineCache.cpp
index d49060fbd..dcd957c8a 100644
--- a/src/Cafe/HW/Latte/Renderer/Metal/MetalPipelineCache.cpp
+++ b/src/Cafe/HW/Latte/Renderer/Metal/MetalPipelineCache.cpp
@@ -27,7 +27,7 @@ static void compileThreadFunc(sint32 threadIndex)
 	SetThreadName("compilePl");
 
 	// one thread runs at normal priority while the others run at lower priority
-	if(threadIndex != 0)
+	if (threadIndex != 0)
 		; // TODO: set thread priority
 
 	while (true)
diff --git a/src/Cafe/HW/Latte/Renderer/Metal/MetalQuery.h b/src/Cafe/HW/Latte/Renderer/Metal/MetalQuery.h
index 7c9bc2cfa..3de0939a0 100644
--- a/src/Cafe/HW/Latte/Renderer/Metal/MetalQuery.h
+++ b/src/Cafe/HW/Latte/Renderer/Metal/MetalQuery.h
@@ -23,6 +23,6 @@ class LatteQueryObjectMtl : public LatteQueryObject
 	class MetalRenderer* m_mtlr;
 
 	MetalQueryRange m_range = {INVALID_UINT32, INVALID_UINT32};
-	// TODO: make this a list of command buffers
+	// TODO: make this a list of command buffers?
 	MTL::CommandBuffer* m_commandBuffer = nullptr;
 };
diff --git a/src/Cafe/HW/Latte/Renderer/Metal/MetalRenderer.cpp b/src/Cafe/HW/Latte/Renderer/Metal/MetalRenderer.cpp
index b2b230ba6..380a3f711 100644
--- a/src/Cafe/HW/Latte/Renderer/Metal/MetalRenderer.cpp
+++ b/src/Cafe/HW/Latte/Renderer/Metal/MetalRenderer.cpp
@@ -1719,7 +1719,6 @@ void MetalRenderer::BindStageResources(MTL::RenderCommandEncoder* renderCommandE
 		auto textureView = m_state.m_textures[hostTextureUnit];
 		if (!textureView)
 		{
-		    // TODO: don't bind if already bound
             if (textureDim == Latte::E_DIM::DIM_1D)
                 SetTexture(renderCommandEncoder, mtlShaderType, m_nullTexture1D, binding);
            	else