diff --git a/source/ChromeDevTools/ChromeProcessFactory.cs b/source/ChromeDevTools/ChromeProcessFactory.cs
index a0076286de8b3cf12957f4365bcdd345e24f3d81..494568ef65ac924090158d1f45d5b8a20d8e7409 100644
--- a/source/ChromeDevTools/ChromeProcessFactory.cs
+++ b/source/ChromeDevTools/ChromeProcessFactory.cs
@@ -6,18 +6,26 @@ namespace MasterDevs.ChromeDevTools
 {
     public class ChromeProcessFactory : IChromeProcessFactory
     {
+        public IDirectoryCleaner DirectoryCleaner { get; set; }
+
+        public ChromeProcessFactory(IDirectoryCleaner directoryCleaner)
+        {
+            DirectoryCleaner = directoryCleaner;
+        }
+
         public IChromeProcess Create(int port)
         {
             string path = Path.GetRandomFileName();
             var directoryInfo = Directory.CreateDirectory(Path.Combine(Path.GetTempPath(), path));
-            var remoteDebuggingArg = "--remote-debugging-port=" + port;
-            var userDirectoryArg = "--user-data-dir=\"" + directoryInfo.FullName + "\"";
-            var chromeProcessArgs = remoteDebuggingArg + " " + userDirectoryArg + " --bwsi --no-first-run";
+            var remoteDebuggingArg = $"--remote-debugging-port={port}";
+            var userDirectoryArg = $"--user-data-dir=\"{directoryInfo.FullName}\"";
+            const string headlessArg = "--headless --disable-gpu";
+            var chromeProcessArgs = $"{headlessArg} {remoteDebuggingArg} {userDirectoryArg} --bwsi --no-first-run";
             var processStartInfo = new ProcessStartInfo(@"C:\Program Files (x86)\Google\Chrome\Application\chrome.exe", chromeProcessArgs);
             var chromeProcess = Process.Start(processStartInfo);
 
             string remoteDebuggingUrl = "http://localhost:" + port;
-            return new LocalChromeProcess(new Uri(remoteDebuggingUrl), directoryInfo, chromeProcess);
+            return new LocalChromeProcess(new Uri(remoteDebuggingUrl), () => DirectoryCleaner.Delete(directoryInfo), chromeProcess);
         }
     }
 }
\ No newline at end of file
diff --git a/source/ChromeDevTools/IDirectoryCleaner.cs b/source/ChromeDevTools/IDirectoryCleaner.cs
new file mode 100644
index 0000000000000000000000000000000000000000..d27977c86040fd8f43155e9887cd267fc330c956
--- /dev/null
+++ b/source/ChromeDevTools/IDirectoryCleaner.cs
@@ -0,0 +1,9 @@
+using System.IO;
+
+namespace MasterDevs.ChromeDevTools
+{
+    public interface IDirectoryCleaner
+    {
+        void Delete(DirectoryInfo dir);
+    }
+}
\ No newline at end of file
diff --git a/source/ChromeDevTools/LocalChromeProcess.cs b/source/ChromeDevTools/LocalChromeProcess.cs
index 62f0e686d371690bd8be0e300de073b1cec0615d..c0756368a9bbdfcf96208eeaa224f2f00bf4b3a7 100644
--- a/source/ChromeDevTools/LocalChromeProcess.cs
+++ b/source/ChromeDevTools/LocalChromeProcess.cs
@@ -1,21 +1,18 @@
 using System;
 using System.Diagnostics;
-using System.IO;
-using System.Threading;
 
 namespace MasterDevs.ChromeDevTools
 {
     public class LocalChromeProcess : RemoteChromeProcess
     {
-        public LocalChromeProcess(Uri remoteDebuggingUri, DirectoryInfo userDirectory, Process process)
+        public LocalChromeProcess(Uri remoteDebuggingUri, Action disposeUserDirectory, Process process)
             : base(remoteDebuggingUri)
         {
-            UserDirectory = userDirectory;
+            DisposeUserDirectory = disposeUserDirectory;
             Process = process;
         }
 
-        public DirectoryInfo UserDirectory { get; set; }
-
+        public Action DisposeUserDirectory { get; set; }
         public Process Process { get; set; }
 
         public override void Dispose()
@@ -23,15 +20,7 @@ namespace MasterDevs.ChromeDevTools
             base.Dispose();
 
             Process.Kill();
-            try
-            {
-                UserDirectory.Delete(true);
-            }
-            catch
-            {
-                Thread.Sleep(500);          // i'm being lazy because i'm tired
-                UserDirectory.Delete(true);
-            }
+            DisposeUserDirectory();
         }
     }
 }
\ No newline at end of file
diff --git a/source/ChromeDevTools/MasterDevs.ChromeDevTools.csproj b/source/ChromeDevTools/MasterDevs.ChromeDevTools.csproj
index e3c29d8dab545f90675472330c0bfa497903c7e9..edd8226b61c0174acfe5d62aec314100a16b43b6 100644
--- a/source/ChromeDevTools/MasterDevs.ChromeDevTools.csproj
+++ b/source/ChromeDevTools/MasterDevs.ChromeDevTools.csproj
@@ -60,6 +60,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ChromeProcessFactory.cs" />
+    <Compile Include="IDirectoryCleaner.cs" />
     <Compile Include="LocalChromeProcess.cs" />
     <Compile Include="ChromeSession.cs" />
     <Compile Include="ChromeSessionExtensions.cs" />
@@ -93,6 +94,7 @@
     <Compile Include="Protocol\**\*.cs" />
     <Compile Include="RemoteChromeProcess.cs" />
     <Compile Include="Serialization\MessageContractResolver.cs" />
+    <Compile Include="StubbornDirectoryCleaner.cs" />
     <Compile Include="SupportedByAttribute.cs" />
   </ItemGroup>
   <ItemGroup>
diff --git a/source/ChromeDevTools/StubbornDirectoryCleaner.cs b/source/ChromeDevTools/StubbornDirectoryCleaner.cs
new file mode 100644
index 0000000000000000000000000000000000000000..4d448698d953da192586d1406278ccfc5db1cfb2
--- /dev/null
+++ b/source/ChromeDevTools/StubbornDirectoryCleaner.cs
@@ -0,0 +1,24 @@
+using System.IO;
+using System.Threading;
+
+namespace MasterDevs.ChromeDevTools
+{
+    public class StubbornDirectoryCleaner : IDirectoryCleaner
+    {
+        public void Delete(DirectoryInfo dir)
+        {
+            while (true)
+            {
+                try
+                {
+                    dir.Delete(true);
+                    return;
+                }
+                catch
+                {
+                    Thread.Sleep(500);
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/Sample/Program.cs b/source/Sample/Program.cs
index b861c9c4d267b1f998ebf0589511593a6d320bcf..ae7011a94ad25b36ebb8f8d3cb7c63cf611ba4c1 100644
--- a/source/Sample/Program.cs
+++ b/source/Sample/Program.cs
@@ -12,7 +12,7 @@ namespace MasterDevs.ChromeDevTools.Sample
             Task.Run(async () =>
             {
                 // STEP 1 - Run Chrome
-                var chromeProcessFactory = new ChromeProcessFactory();
+                var chromeProcessFactory = new ChromeProcessFactory(new StubbornDirectoryCleaner());
                 using (var chromeProcess = chromeProcessFactory.Create(9222))
                 {
                     // STEP 2 - Create a debugging session