diff --git a/layers/mem_tracker.cpp b/layers/mem_tracker.cpp
index 196596a..a7e8c29 100644
--- a/layers/mem_tracker.cpp
+++ b/layers/mem_tracker.cpp
@@ -52,7 +52,6 @@
 #include "vk_layer_table.h"
 #include "vk_layer_data.h"
 #include "vk_layer_logging.h"
-static LOADER_PLATFORM_THREAD_ONCE_DECLARATION(g_initOnce);
 
 // WSI Image Objects bypass usual Image Object creation methods.  A special Memory
 // Object value will be used to identify them internally.
@@ -127,6 +126,8 @@
                 return &(*it).second;
             break;
         }
+        default:
+            break;
     }
     return retValue;
 }
@@ -229,6 +230,8 @@
             pCI->mem = mem;
             break;
         }
+        default:
+            break;
     }
 }
 
@@ -270,6 +273,8 @@
                 const_cast<VkSwapchainCreateInfoKHR*>(static_cast<const VkSwapchainCreateInfoKHR *>(pCreateInfo))->imageUsage;
             break;
         }
+        default:
+            break;
     }
 }
 
@@ -898,7 +903,6 @@
                 pInfo->refCount++;
             }
             // Need to set mem binding for this object
-            MT_MEM_OBJ_INFO* pPrevBinding = get_mem_obj_info(my_data, pObjBindInfo->mem);
             pObjBindInfo->mem = mem;
         }
     }