diff --git a/.gitignore b/.gitignore
index 9eb2979ed8..de64448ef6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,10 +35,6 @@ UpgradeLog.htm
 .hgignore
 .hgtags
 
-/psx/octoshock/bizhawk/Win32
-/psx/octoshock/bizhawk/x64
-/psx/octoshock/bizhawk/*.opendb
-
 **/StyleCop.Cache
 /waterbox/**/*.wbx
 /waterbox/**/*.wbx.in
diff --git a/Building Other Solutions.txt b/Building Other Solutions.txt
index f1685b30c0..e8bd405246 100644
--- a/Building Other Solutions.txt	
+++ b/Building Other Solutions.txt	
@@ -14,7 +14,6 @@ wonderswan: use wonderswan/msvc/bizswan.sln
 libretrobridge: use LibretroBridge/msvc/LibretroBridge.sln
 quicknes: use quicknes/msvc/libquicknes.sln
 gambatte: use submodules/gambatte/bizhawk/msvc/libgambatte.sln
-octoshock (psx): use psx/octoshock/bizhawk/octoshock.sln
 
 libmupen64plus: 
 Use mupen64plus-sln/projects/msvc11/mupen64plus.sln.
diff --git a/README.md b/README.md
index b83726d888..375e54b7c0 100644
--- a/README.md
+++ b/README.md
@@ -349,7 +349,7 @@ Neo Geo Pocket | **NeoPop**
 NES | **NesHawk**, quickerNES
 Odyssey² | **O2Hawk**
 PC-FX | **T.S.T.**
-Playstation (PSX) | **Nymashock**, **Octoshock**
+Playstation (PSX) | **Nymashock**
 Sega 32X | **PicoDrive**
 Sega Game Gear | **SMSHawk**
 Sega Genesis | **Genplus-gx**
diff --git a/contributing.md b/contributing.md
index 24b32e8460..2800c167bf 100644
--- a/contributing.md
+++ b/contributing.md
@@ -22,7 +22,6 @@ Jump to:
 	- [MSXHawk](#msxhawk)
 	- [NLua](#nlua)
 	- [Nyma cores](#nyma-cores)
-	- [Octoshock](#octoshock)
 	- [quickerNES](#quickernes)
 	- [Roslyn Analyzers](#roslyn-analyzers)
 	- [Virtu](#virtu)
@@ -260,13 +259,6 @@ See [Waterbox (toolchain + cores)](#waterbox-toolchain--cores).
 
 
 
-## Octoshock
-> The unmanaged side of the Octoshock core from Mednafen.
-
-Uses C++.
-
-
-
 ## quickerNES
 > The unmanaged side of the quickerNES core.