diff --git a/src/dawn_native/BindGroupLayout.cpp b/src/dawn_native/BindGroupLayout.cpp
index 3c2cb06ae4..b65f469204 100644
--- a/src/dawn_native/BindGroupLayout.cpp
+++ b/src/dawn_native/BindGroupLayout.cpp
@@ -48,7 +48,6 @@ namespace dawn_native {
 
             case wgpu::BindingType::StorageTexture: {
                 return DAWN_VALIDATION_ERROR("Read-write storage texture binding is not supported");
-                break;
             }
 
             case wgpu::BindingType::UniformBuffer:
diff --git a/src/dawn_native/CommandValidation.cpp b/src/dawn_native/CommandValidation.cpp
index 4b784d4c03..e56d0e34fa 100644
--- a/src/dawn_native/CommandValidation.cpp
+++ b/src/dawn_native/CommandValidation.cpp
@@ -161,7 +161,6 @@ namespace dawn_native {
                     commands->NextCommand<EndRenderPassCmd>();
                     DAWN_TRY(ValidateFinalDebugGroupStackSize(debugGroupStackSize));
                     return {};
-                    break;
                 }
 
                 case Command::ExecuteBundles: {
@@ -225,7 +224,6 @@ namespace dawn_native {
                     commands->NextCommand<EndComputePassCmd>();
                     DAWN_TRY(ValidateFinalDebugGroupStackSize(debugGroupStackSize));
                     return {};
-                    break;
                 }
 
                 case Command::Dispatch: {
diff --git a/src/dawn_native/d3d12/CommandBufferD3D12.cpp b/src/dawn_native/d3d12/CommandBufferD3D12.cpp
index efa12151f5..104e5b1487 100644
--- a/src/dawn_native/d3d12/CommandBufferD3D12.cpp
+++ b/src/dawn_native/d3d12/CommandBufferD3D12.cpp
@@ -758,7 +758,6 @@ namespace dawn_native { namespace d3d12 {
                 case Command::EndComputePass: {
                     mCommands.NextCommand<EndComputePassCmd>();
                     return {};
-                    break;
                 }
 
                 case Command::SetComputePipeline: {
@@ -1160,7 +1159,6 @@ namespace dawn_native { namespace d3d12 {
                         ResolveMultisampledRenderPass(commandContext, renderPass);
                     }
                     return {};
-                    break;
                 }
 
                 case Command::SetStencilReference: {
diff --git a/src/dawn_native/d3d12/ResourceAllocatorManagerD3D12.cpp b/src/dawn_native/d3d12/ResourceAllocatorManagerD3D12.cpp
index 7faa0de16b..3176f5bd8a 100644
--- a/src/dawn_native/d3d12/ResourceAllocatorManagerD3D12.cpp
+++ b/src/dawn_native/d3d12/ResourceAllocatorManagerD3D12.cpp
@@ -98,11 +98,10 @@ namespace dawn_native { namespace d3d12 {
                             if ((flags & D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL) ||
                                 (flags & D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET)) {
                                 return Default_OnlyRenderableOrDepthTextures;
-                            } else {
-                                return Default_OnlyNonRenderableOrDepthTextures;
                             }
-                            break;
+                            return Default_OnlyNonRenderableOrDepthTextures;
                         }
+
                         default:
                             UNREACHABLE();
                     }
diff --git a/src/dawn_native/metal/CommandBufferMTL.mm b/src/dawn_native/metal/CommandBufferMTL.mm
index dda3f3bb66..67ec57cc7e 100644
--- a/src/dawn_native/metal/CommandBufferMTL.mm
+++ b/src/dawn_native/metal/CommandBufferMTL.mm
@@ -845,7 +845,6 @@ namespace dawn_native { namespace metal {
                     mCommands.NextCommand<EndComputePassCmd>();
                     commandContext->EndCompute();
                     return;
-                    break;
                 }
 
                 case Command::Dispatch: {
@@ -1218,7 +1217,6 @@ namespace dawn_native { namespace metal {
                     mCommands.NextCommand<EndRenderPassCmd>();
                     commandContext->EndRender();
                     return;
-                    break;
                 }
 
                 case Command::SetStencilReference: {
diff --git a/src/dawn_native/opengl/CommandBufferGL.cpp b/src/dawn_native/opengl/CommandBufferGL.cpp
index 97e346009d..19e674f4a6 100644
--- a/src/dawn_native/opengl/CommandBufferGL.cpp
+++ b/src/dawn_native/opengl/CommandBufferGL.cpp
@@ -654,7 +654,6 @@ namespace dawn_native { namespace opengl {
                 case Command::EndComputePass: {
                     mCommands.NextCommand<EndComputePassCmd>();
                     return;
-                    break;
                 }
 
                 case Command::Dispatch: {
@@ -1013,7 +1012,6 @@ namespace dawn_native { namespace opengl {
                     }
                     gl.DeleteFramebuffers(1, &fbo);
                     return;
-                    break;
                 }
 
                 case Command::SetStencilReference: {
diff --git a/src/dawn_native/vulkan/CommandBufferVk.cpp b/src/dawn_native/vulkan/CommandBufferVk.cpp
index 0ea834cea9..c2c011040a 100644
--- a/src/dawn_native/vulkan/CommandBufferVk.cpp
+++ b/src/dawn_native/vulkan/CommandBufferVk.cpp
@@ -572,7 +572,6 @@ namespace dawn_native { namespace vulkan {
                 case Command::EndComputePass: {
                     mCommands.NextCommand<EndComputePassCmd>();
                     return;
-                    break;
                 }
 
                 case Command::Dispatch: {
@@ -876,7 +875,6 @@ namespace dawn_native { namespace vulkan {
                     mCommands.NextCommand<EndRenderPassCmd>();
                     device->fn.CmdEndRenderPass(commands);
                     return {};
-                    break;
                 }
 
                 case Command::SetBlendColor: {