diff --git a/.gitmodules b/.gitmodules
index 13ad45ae3..62b18a5c9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -96,7 +96,7 @@
 	url = https://github.com/p-ranav/tabulate.git
 [submodule "third_party/rapidcsv"]
 	path = third_party/rapidcsv
-	url = https://github.com/d99kris/rapidcsv
+	url = https://github.com/d99kris/rapidcsv.git
 [submodule "third_party/zlib"]
 	path = third_party/zlib
 	url = https://github.com/madler/zlib.git
diff --git a/README.md b/README.md
index 708d45527..d39350df6 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 <p align="center">
     <a href="https://github.com/xenia-canary/xenia-canary/tree/canary_experimental/assets/icon">
-        <img height="120px" src="https://raw.githubusercontent.com/xenia-canary/xenia/master/assets/icon/128.png" />
+        <img height="256px" src="https://raw.githubusercontent.com/xenia-canary/xenia/master/assets/icon/256.png" />
     </a>
 </p>
 
diff --git a/src/xenia/apu/nop/nop_apu_flags.cc b/src/xenia/apu/nop/nop_apu_flags.cc
deleted file mode 100644
index 5e54ee040..000000000
--- a/src/xenia/apu/nop/nop_apu_flags.cc
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- ******************************************************************************
- * Xenia : Xbox 360 Emulator Research Project                                 *
- ******************************************************************************
- * Copyright 2013 Ben Vanik. All rights reserved.                             *
- * Released under the BSD license - see LICENSE in the root for more details. *
- ******************************************************************************
- */
-
-#include "xenia/apu/nop/nop_apu_flags.h"
diff --git a/src/xenia/apu/nop/nop_apu_flags.h b/src/xenia/apu/nop/nop_apu_flags.h
deleted file mode 100644
index 5a2da249c..000000000
--- a/src/xenia/apu/nop/nop_apu_flags.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- ******************************************************************************
- * Xenia : Xbox 360 Emulator Research Project                                 *
- ******************************************************************************
- * Copyright 2013 Ben Vanik. All rights reserved.                             *
- * Released under the BSD license - see LICENSE in the root for more details. *
- ******************************************************************************
- */
-
-#ifndef XENIA_APU_NOP_NOP_APU_FLAGS_H_
-#define XENIA_APU_NOP_NOP_APU_FLAGS_H_
-
-#endif  // XENIA_APU_NOP_NOP_APU_FLAGS_H_
diff --git a/src/xenia/apu/xaudio2/xaudio2_apu_flags.cc b/src/xenia/apu/xaudio2/xaudio2_apu_flags.cc
deleted file mode 100644
index 4aae6486d..000000000
--- a/src/xenia/apu/xaudio2/xaudio2_apu_flags.cc
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- ******************************************************************************
- * Xenia : Xbox 360 Emulator Research Project                                 *
- ******************************************************************************
- * Copyright 2013 Ben Vanik. All rights reserved.                             *
- * Released under the BSD license - see LICENSE in the root for more details. *
- ******************************************************************************
- */
-
-#include "xenia/apu/xaudio2/xaudio2_apu_flags.h"
diff --git a/src/xenia/apu/xaudio2/xaudio2_apu_flags.h b/src/xenia/apu/xaudio2/xaudio2_apu_flags.h
deleted file mode 100644
index f491f5d01..000000000
--- a/src/xenia/apu/xaudio2/xaudio2_apu_flags.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- ******************************************************************************
- * Xenia : Xbox 360 Emulator Research Project                                 *
- ******************************************************************************
- * Copyright 2013 Ben Vanik. All rights reserved.                             *
- * Released under the BSD license - see LICENSE in the root for more details. *
- ******************************************************************************
- */
-
-#ifndef XENIA_APU_XAUDIO2_XAUDIO2_APU_FLAGS_H_
-#define XENIA_APU_XAUDIO2_XAUDIO2_APU_FLAGS_H_
-
-#endif  // XENIA_APU_XAUDIO2_XAUDIO2_APU_FLAGS_H_
diff --git a/src/xenia/base/main_init_android.cc b/src/xenia/base/main_init_android.cc
deleted file mode 100644
index 28b976731..000000000
--- a/src/xenia/base/main_init_android.cc
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- ******************************************************************************
- * Xenia : Xbox 360 Emulator Research Project                                 *
- ******************************************************************************
- * Copyright 2021 Ben Vanik. All rights reserved.                             *
- * Released under the BSD license - see LICENSE in the root for more details. *
- ******************************************************************************
- */
-
-// Nothing. Stub.
diff --git a/src/xenia/base/main_init_posix.cc b/src/xenia/base/main_init_posix.cc
deleted file mode 100644
index 28b976731..000000000
--- a/src/xenia/base/main_init_posix.cc
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- ******************************************************************************
- * Xenia : Xbox 360 Emulator Research Project                                 *
- ******************************************************************************
- * Copyright 2021 Ben Vanik. All rights reserved.                             *
- * Released under the BSD license - see LICENSE in the root for more details. *
- ******************************************************************************
- */
-
-// Nothing. Stub.
diff --git a/third_party/glslang b/third_party/glslang
index f4f1d8a35..ae2a56293 160000
--- a/third_party/glslang
+++ b/third_party/glslang
@@ -1 +1 @@
-Subproject commit f4f1d8a352ca1908943aea2ad8c54b39b4879080
+Subproject commit ae2a562936cc8504c9ef2757cceaff163147834f