diff --git a/src/Tgstation.Server.Host/Components/DreamDaemon.cs b/src/Tgstation.Server.Host/Components/DreamDaemon.cs
index d90137ae82..04055e8757 100644
--- a/src/Tgstation.Server.Host/Components/DreamDaemon.cs
+++ b/src/Tgstation.Server.Host/Components/DreamDaemon.cs
@@ -3,12 +3,11 @@ using System.Threading;
using System.Threading.Tasks;
using Tgstation.Server.Api.Models;
using Tgstation.Server.Api.Models.Internal;
-using Tgstation.Server.Host.Security;
namespace Tgstation.Server.Host.Components
{
///
- sealed class DreamDaemon : IDreamDaemon, IDisposable
+ sealed class DreamDaemon : IDreamDaemon, ILaunchParametersFactory, IDisposable
{
///
public bool Running { get; private set; }
@@ -33,29 +32,13 @@ namespace Tgstation.Server.Host.Components
///
readonly IEventConsumer eventConsumer;
///
- /// The for
- ///
- readonly IByond byond;
- ///
- /// The for
- ///
- readonly ICryptographySuite cryptographySuite;
- ///
/// The for
///
readonly IInterop interop;
///
- /// The for
+ /// The for
///
- readonly IInstanceShutdownMethod instanceShutdownMethod;
- ///
- /// The for
- ///
- readonly IDreamDaemonExecutor dreamDaemonExecutor;
- ///
- /// The for
- ///
- readonly IDmbFactory dmbFactory;
+ readonly IWatchdog watchdog;
///
/// Used for write control to class variables
@@ -72,39 +55,18 @@ namespace Tgstation.Server.Host.Components
///
DreamDaemonLaunchParameters currentLaunchParameters;
- ///
- /// The for
- ///
- CancellationTokenSource watchdogCancellationTokenSource;
- ///
- /// The monitor for the DD process
- ///
- Task watchdogTask;
- ///
- /// to complete when the primary server is primed
- ///
- TaskCompletionSource