diff --git a/.github/workflows/runner-cleanup.yml b/.github/workflows/runner-cleanup.yml
deleted file mode 100644
index dbccdad3..00000000
--- a/.github/workflows/runner-cleanup.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-name: "Runner Cleanup"
-
-on:
-  workflow_dispatch:
-
-jobs:
-  Cleanup:
-    runs-on: self-hosted
-    steps:
-    - name: Self Hosted Runner Post Job Cleanup Action
-      uses: TooMuch4U/actions-clean@v2.1
-            
\ No newline at end of file
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 0fc620a6..00000000
--- a/.gitmodules
+++ /dev/null
@@ -1,12 +0,0 @@
-[submodule "rd-submodules/retroarch"]
-	path = rd-submodules/retroarch
-	url = https://github.com/flathub/org.libretro.RetroArch.git
-[submodule "rd-submodules/shared-modules"]
-	path = rd-submodules/shared-modules
-	url = https://github.com/flathub/shared-modules.git
-[submodule "shared-modules"]
-	path = shared-modules
-	url = https://github.com/flathub/shared-modules.git
-[submodule "rd-submodules/ryujinx"]
-	path = rd-submodules/ryujinx
-	url = https://github.com/flathub/org.ryujinx.Ryujinx
diff --git a/automation_tools/force_update_submodules.sh b/automation_tools/force_update_submodules.sh
index d8760817..d8cd87d9 100755
--- a/automation_tools/force_update_submodules.sh
+++ b/automation_tools/force_update_submodules.sh
@@ -2,7 +2,7 @@
 
 # WARNING: DANGEROUS! Don't use this script lightly
 
-#git submodule deinit --all
+git submodule deinit -f --all
 
 rm -rf rd-submodules/retroarch
 git rm -rf --cached rd-submodules/retroarch
@@ -16,6 +16,8 @@ rm -rf rd-submodules/shared-modules
 git rm -rf --cached rd-submodules/shared-modules
 rm -rf .git/modules/rd-submodules/shared-modules
 
+rm .gitmodules
+
 git submodule add https://github.com/flathub/shared-modules.git rd-submodules/shared-modules
 git submodule add https://github.com/flathub/org.libretro.RetroArch.git rd-submodules/retroarch
 git submodule add https://github.com/flathub/org.ryujinx.Ryujinx rd-submodules/ryujinx
diff --git a/rd-submodules/retroarch b/rd-submodules/retroarch
deleted file mode 160000
index a9682176..00000000
--- a/rd-submodules/retroarch
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a96821769848a711db1ed0b71883f91383e2b4ab
diff --git a/rd-submodules/ryujinx b/rd-submodules/ryujinx
deleted file mode 160000
index f9e0cd83..00000000
--- a/rd-submodules/ryujinx
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f9e0cd83f366025c15de7de46621963cab793ea9
diff --git a/rd-submodules/shared-modules b/rd-submodules/shared-modules
deleted file mode 160000
index 55a8e460..00000000
--- a/rd-submodules/shared-modules
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 55a8e460c6343229597a13e973ba4855c27a1c4c