diff --git a/.vscode/settings.json b/.vscode/settings.json
index f369ecb1748..2fc34952a67 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -11,6 +11,7 @@
     },
     "files.associations": {
         "*.h": "c",
+        "*.ino": "cpp",
         "*.c": "c",
         "*.inc": "c",
         "*.cpp": "cpp",
@@ -18,7 +19,16 @@
         "xstddef": "c",
         "type_traits": "c",
         "utility": "c",
-        "ranges": "c"
+        "ranges": "c",
+        "ios": "c",
+        "regex": "c",
+        "random": "c",
+        "variant": "c",
+        "chrono": "c",
+        "limits": "c",
+        "algorithm": "c",
+        "locale": "c",
+        "string": "c"
     },
     "[markdown]": {
         "editor.trimAutoWhitespace": false,
diff --git a/qmk_firmware b/qmk_firmware
deleted file mode 160000
index 00aec9e6be8..00000000000
--- a/qmk_firmware
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 00aec9e6be8a59e4bf697bba98ec52f917047cf3