diff --git a/BizHawk.Client.Common/RomLoader.cs b/BizHawk.Client.Common/RomLoader.cs
index e049539af5..a1a3d3c3e5 100644
--- a/BizHawk.Client.Common/RomLoader.cs
+++ b/BizHawk.Client.Common/RomLoader.cs
@@ -750,7 +750,7 @@ namespace BizHawk.Client.Common
 									if(Global.Config.NES_InQuickNES) preference = "quicknes";
 
 									//if user has saw fit to override in gamedb, apply that
-									if(Global.Config.CoreForcingViaGameDB)
+									if (Global.Config.CoreForcingViaGameDB && !string.IsNullOrEmpty(game.ForcedCore))
 										preference = game.ForcedCore;
 
 									//but only neshawk is accurate
diff --git a/BizHawk.Emulation.Common/Database/Database.cs b/BizHawk.Emulation.Common/Database/Database.cs
index 07a515e0b0..d137104f7a 100644
--- a/BizHawk.Emulation.Common/Database/Database.cs
+++ b/BizHawk.Emulation.Common/Database/Database.cs
@@ -194,10 +194,6 @@ namespace BizHawk.Emulation.Common
 						game.MetaData = items.Length >= 6 ? items[5] : null;
 						game.Region = items.Length >= 7 ? items[6] : string.Empty;
 						game.ForcedCore = items.Length >= 8 ? items[7].ToLowerInvariant() : string.Empty;
-						if (items.Length >= 8)
-						{
-							int zzz = 9;
-						}
 
 						if (db.ContainsKey(game.Hash))
 						{