diff --git a/Assets/dll/dobie.wbx.gz b/Assets/dll/dobie.wbx.gz
deleted file mode 100644
index c5ce9c5783..0000000000
Binary files a/Assets/dll/dobie.wbx.gz and /dev/null differ
diff --git a/src/BizHawk.Client.Common/RomLoader.cs b/src/BizHawk.Client.Common/RomLoader.cs
index 14767e8d99..70df1767e3 100644
--- a/src/BizHawk.Client.Common/RomLoader.cs
+++ b/src/BizHawk.Client.Common/RomLoader.cs
@@ -248,12 +248,6 @@ namespace BizHawk.Client.Common
 					case DiscType.SegaSaturn:
 						game.System = VSystemID.Raw.SAT;
 						break;
-					case DiscType.SonyPSP:
-						game.System = "PSP";
-						break;
-					case DiscType.SonyPS2:
-						game.System = VSystemID.Raw.PS2;
-						break;
 					case DiscType.MegaCD:
 						game.System = VSystemID.Raw.GEN;
 						break;
@@ -273,6 +267,8 @@ namespace BizHawk.Client.Common
 					case DiscType.NeoGeoCD:
 					case DiscType.Panasonic3DO:
 					case DiscType.Playdia:
+					case DiscType.SonyPS2:
+					case DiscType.SonyPSP:
 					case DiscType.Wii:
 						// no supported emulator core for these (yet)
 						game.System = discType.ToString();
diff --git a/src/BizHawk.Client.Common/config/PathEntryCollection.cs b/src/BizHawk.Client.Common/config/PathEntryCollection.cs
index 98e2700515..6976bfa799 100644
--- a/src/BizHawk.Client.Common/config/PathEntryCollection.cs
+++ b/src/BizHawk.Client.Common/config/PathEntryCollection.cs
@@ -59,7 +59,6 @@ namespace BizHawk.Client.Common
 			[VSystemID.Raw.NDS] = "NDS",
 			[VSystemID.Raw.Sega32X] = "Sega 32X",
 			[VSystemID.Raw.GGL] = "Dual Game Gear",
-			[VSystemID.Raw.PS2] = "Playstation 2",
 		};
 
 		private static PathEntry BaseEntryFor(string sysID, string path)
@@ -264,8 +263,6 @@ namespace BizHawk.Client.Common
 
 			CommonEntriesFor(VSystemID.Raw.PCFX, basePath: Path.Combine(".", "PCFX")),
 
-			CommonEntriesFor(VSystemID.Raw.PS2, basePath: Path.Combine(".", "PS2")),
-
 			CommonEntriesFor(VSystemID.Raw.PSX, basePath: Path.Combine(".", "PSX")),
 
 			CommonEntriesFor(VSystemID.Raw.SAT, basePath: Path.Combine(".", "Saturn")),
diff --git a/src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs b/src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs
index 1b01001f38..8d5e92a1d3 100644
--- a/src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs
+++ b/src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs
@@ -86,7 +86,6 @@ namespace BizHawk.Client.EmuHawk
 			["ChannelF"] = "Channel F",
 			["VEC"] = "Vectrex",
 			["MSX"] = "MSX",
-			["PS2"] = "Sony PlayStation 2",
 		};
 
 		public string TargetSystem { get; set; }
diff --git a/src/BizHawk.Emulation.Common/Database/FirmwareDatabase.cs b/src/BizHawk.Emulation.Common/Database/FirmwareDatabase.cs
index bf87b1af33..095b288279 100644
--- a/src/BizHawk.Emulation.Common/Database/FirmwareDatabase.cs
+++ b/src/BizHawk.Emulation.Common/Database/FirmwareDatabase.cs
@@ -453,13 +453,13 @@ namespace BizHawk.Emulation.Common
 			var fxscsi = File("65482A23AC5C10A6095AEE1DB5824CCA54EAD6E5", 512 * 1024, "PCFX_fx-scsi.rom", "PCFX SCSI ROM");
 			Option("PCFX", "SCSIROM", in fxscsi);
 
-			Firmware("PS2", "BIOS", "PS2 Bios");
+			/*Firmware("PS2", "BIOS", "PS2 Bios");
 			Option("PS2", "BIOS", File("FBD54BFC020AF34008B317DCB80B812DD29B3759", 4 * 1024 * 1024, "ps2-0230j-20080220.bin", "PS2 Bios"));
 			Option("PS2", "BIOS", File("8361D615CC895962E0F0838489337574DBDC9173", 4 * 1024 * 1024, "ps2-0220a-20060905.bin", "PS2 Bios"));
 			Option("PS2", "BIOS", File("DA5AACEAD2FB55807D6D4E70B1F10F4FDCFD3281", 4 * 1024 * 1024, "ps2-0220e-20060905.bin", "PS2 Bios"));
 			Option("PS2", "BIOS", File("3BAF847C1C217AA71AC6D298389C88EDB3DB32E2", 4 * 1024 * 1024, "ps2-0220j-20060905.bin", "PS2 Bios"));
 			Option("PS2", "BIOS", File("F9229FE159D0353B9F0632F3FDC66819C9030458", 4 * 1024 * 1024, "ps2-0230a-20080220.bin", "PS2 Bios"), FirmwareOptionStatus.Ideal);
-			Option("PS2", "BIOS", File("9915B5BA56798F4027AC1BD8D10ABE0C1C9C326A", 4 * 1024 * 1024, "ps2-0230e-20080220.bin", "PS2 Bios"));
+			Option("PS2", "BIOS", File("9915B5BA56798F4027AC1BD8D10ABE0C1C9C326A", 4 * 1024 * 1024, "ps2-0230e-20080220.bin", "PS2 Bios"));*/
 
 			AllPatches = allPatches;
 			FirmwareFilesByHash = filesByHash;
diff --git a/src/BizHawk.Emulation.Common/Extensions.cs b/src/BizHawk.Emulation.Common/Extensions.cs
index 8d32793bd5..517c300194 100644
--- a/src/BizHawk.Emulation.Common/Extensions.cs
+++ b/src/BizHawk.Emulation.Common/Extensions.cs
@@ -48,7 +48,6 @@ namespace BizHawk.Emulation.Common
 			[VSystemID.Raw.PCE] = "TurboGrafx-16",
 			[VSystemID.Raw.PCECD] = "TurboGrafx - 16(CD)",
 			[VSystemID.Raw.PCFX] = "PCFX",
-			[VSystemID.Raw.PS2] = "PlayStation 2",
 			[VSystemID.Raw.PSX] = "PlayStation",
 			[VSystemID.Raw.SAT] = "Saturn",
 			[VSystemID.Raw.Sega32X] = "Genesis 32X",
diff --git a/src/BizHawk.Emulation.Common/VSystemID.cs b/src/BizHawk.Emulation.Common/VSystemID.cs
index fd1acaa02a..84947d4fba 100644
--- a/src/BizHawk.Emulation.Common/VSystemID.cs
+++ b/src/BizHawk.Emulation.Common/VSystemID.cs
@@ -41,7 +41,6 @@ namespace BizHawk.Emulation.Common
 			public const string PCE = "PCE";
 			public const string PCECD = "PCECD";
 			public const string PCFX = "PCFX";
-			public const string PS2 = "PS2";
 			public const string PSX = "PSX";
 			public const string SAT = "SAT";
 			public const string Sega32X = "32X";