diff --git a/SparkleShare/Windows/SparkleController.cs b/SparkleShare/Windows/SparkleController.cs
index ed9a65f1..fe9911a9 100644
--- a/SparkleShare/Windows/SparkleController.cs
+++ b/SparkleShare/Windows/SparkleController.cs
@@ -58,7 +58,6 @@ namespace SparkleShare {
             string executable_path = Path.GetDirectoryName (Forms.Application.ExecutablePath);
             string msysgit_path    = Path.Combine (executable_path, "msysgit");
 
-
             string new_PATH = msysgit_path + @"\bin" + ";" +
                 msysgit_path + @"\mingw\bin" + ";" +
                 msysgit_path + @"\cmd" + ";" +
@@ -67,7 +66,6 @@ namespace SparkleShare {
             Environment.SetEnvironmentVariable ("PATH", new_PATH);
             Environment.SetEnvironmentVariable ("HOME", Environment.GetFolderPath (Environment.SpecialFolder.UserProfile));
 
-            StartSSH ();
             SparkleLib.Git.SparkleGit.SSHPath = Path.Combine (msysgit_path, "bin", "ssh.exe");
 
             base.Initialize ();
@@ -201,70 +199,7 @@ namespace SparkleShare {
 
         public override void Quit ()
         {
-            StopSSH ();
             base.Quit ();
         }
-
-
-        private void StartSSH ()
-        {
-            string auth_agent_pid = Environment.GetEnvironmentVariable ("SSH_AGENT_PID");
-
-            if (!string.IsNullOrEmpty (auth_agent_pid)) {
-                SparkleLogger.LogInfo ("Controller", "Trying to use existing ssh-agent with PID=" + auth_agent_pid + "...");
-                this.ssh_agent_pid = Convert.ToInt32 (auth_agent_pid);
-                
-                try {
-                    Process ssh_agent = Process.GetProcessById (this.ssh_agent_pid);
-                    SparkleLogger.LogInfo ("Controller", "Using existing ssh-agent with PID=" + this.ssh_agent_pid);
-
-                    return;
-
-                } catch (ArgumentException) {
-                    SparkleLogger.LogInfo ("Controller", "ssh-agent with PID=" + auth_agent_pid + " does not exist. Starting a new one...");
-                }
-            }
-
-            Process process                          = new Process ();
-            process.StartInfo.FileName               = "ssh-agent";
-            process.StartInfo.UseShellExecute        = false;
-            process.StartInfo.RedirectStandardOutput = true;
-            process.StartInfo.CreateNoWindow         = true;
-
-            process.Start ();
-
-            string output = process.StandardOutput.ReadToEnd ();
-            process.WaitForExit ();
-
-            Match auth_sock_match = new Regex (@"SSH_AUTH_SOCK=([^;\n\r]*)").Match (output);
-            Match ssh_pid_match   = new Regex (@"SSH_AGENT_PID=([^;\n\r]*)").Match (output);
-
-            if (auth_sock_match.Success)
-                Environment.SetEnvironmentVariable ("SSH_AUTH_SOCK", auth_sock_match.Groups [1].Value);
-
-            if (ssh_pid_match.Success) {
-                Int32.TryParse (ssh_pid_match.Groups [1].Value, out this.ssh_agent_pid);
-                Environment.SetEnvironmentVariable ("SSH_AGENT_PID", "" + this.ssh_agent_pid);
-
-                SparkleLogger.LogInfo ("Controller", "ssh-agent started, PID=" + this.ssh_agent_pid);
-
-            } else {
-                SparkleLogger.LogInfo ("Controller", "Could not start ssh-agent:" + output);
-            }
-        }
-
-
-        private void StopSSH ()
-        {
-            if (this.ssh_agent_pid == 0)
-                return;
-
-            try {
-                Process.GetProcessById (this.ssh_agent_pid).Kill ();
-
-            } catch (ArgumentException e) {
-                SparkleLogger.LogInfo ("SSH", "Could not stop ssh-agent: " + e.Message);
-            }
-        }
     }
 }