diff --git a/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs b/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
index 63878d9d77..51f429e632 100644
--- a/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
+++ b/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
@@ -19,8 +19,6 @@ namespace BizHawk.Client.EmuHawk
 {
 	public partial class LuaConsole : Form, IToolForm
 	{
-		public IDictionary<Type, object> EmulatorServices { private get; set; }
-
 		private readonly LuaFileList _luaList;
 		private int _defaultWidth;
 		private int _defaultHeight;
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.IToolForm.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.IToolForm.cs
index f6b50fb5eb..ac648befe5 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.IToolForm.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.IToolForm.cs
@@ -8,9 +8,10 @@ namespace BizHawk.Client.EmuHawk
 {
 	public partial class TAStudio : IToolForm
 	{
-		public IDictionary<Type, object> EmulatorServices { private get; set; }
-		public IEmulator Emulator { get { return (IEmulator)EmulatorServices[typeof(IEmulator)]; } }
-		public IStatable StatableEmulator { get { return (IStatable)EmulatorServices[typeof(IStatable)]; } }
+		[RequiredService]
+		public IEmulator Emulator { get; private set; }
+		[RequiredService]
+		public IStatable StatableEmulator { get; private set; }
 
 		private bool _hackyDontUpdate;
 		private bool _initializing; // If true, will bypass restart logic, this is necessary since loading projects causes a movie to load which causes a rom to reload causing dialogs to restart
diff --git a/BizHawk.Client.EmuHawk/tools/ToolBox.cs b/BizHawk.Client.EmuHawk/tools/ToolBox.cs
index cfb275e1b3..7cef40de47 100644
--- a/BizHawk.Client.EmuHawk/tools/ToolBox.cs
+++ b/BizHawk.Client.EmuHawk/tools/ToolBox.cs
@@ -19,8 +19,6 @@ namespace BizHawk.Client.EmuHawk
 {
 	public partial class ToolBox : Form, IToolForm
 	{
-		public IDictionary<Type, object> EmulatorServices { private get; set; }
-
 		public ToolBox()
 		{
 			InitializeComponent();
diff --git a/BizHawk.Client.EmuHawk/tools/TraceLogger.cs b/BizHawk.Client.EmuHawk/tools/TraceLogger.cs
index d2442e0429..2e32bf39a1 100644
--- a/BizHawk.Client.EmuHawk/tools/TraceLogger.cs
+++ b/BizHawk.Client.EmuHawk/tools/TraceLogger.cs
@@ -16,8 +16,6 @@ namespace BizHawk.Client.EmuHawk
 {
 	public partial class TraceLogger : Form, IToolForm
 	{
-		public IDictionary<Type, object> EmulatorServices { private get; set; }
-
 		[RequiredService]
 		private IDebuggable _debugtarget { get; set; }
 		private ITracer Tracer { get { return _debugtarget.Tracer; } }
diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.cs
index 736befbea6..690cff3b72 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.cs
@@ -25,8 +25,6 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
-		public IDictionary<Type, object> EmulatorServices { private get; set; }
-		
 		public bool Readonly
 		{
 			get