diff --git a/Mage/Config.php b/Mage/Config.php
index 2991acd..da1223c 100644
--- a/Mage/Config.php
+++ b/Mage/Config.php
@@ -121,29 +121,6 @@ class Config
         return $this->parseConfigFile($filePath);
     }
 
-
-    /**
-     * Obviously this method is a HACK.  It was refactored from ::loadEnvironment()
-     * TODO Please put it to SCM functionality.
-     *
-     * @param array $settings
-     *
-     * @return array
-     */
-    protected function updateSCMTempDir(array $settings)
-    {
-        // Create temporal directory for clone
-        if (isset($settings['deployment']['source']) && is_array($settings['deployment']['source'])) {
-            if (trim($settings['deployment']['source']['temporal']) == '') {
-                $settings['deployment']['source']['temporal'] = sys_get_temp_dir();
-            }
-            $settings['deployment']['source']['temporal']
-                = rtrim($settings['deployment']['source']['temporal'], '/') . '/' . md5(microtime()) . '/';
-        }
-
-        return $settings;
-    }
-
     /**
      * Loads the Environment configuration
      * @param $filePath string
@@ -156,9 +133,6 @@ class Config
 
         $settings = $this->parseConfigFile($filePath);
 
-        //this is a HACK in the old code - no time to remove it now, so I factored it out in own method
-        $settings = $this->updateSCMTempDir($settings);
-
         return $settings;
 
     }
@@ -490,6 +464,11 @@ class Config
         }
     }
 
+    public function setSourceTemporal($directory)
+    {
+        $this->environmentConfig['deployment']['source']['temporal'] = $directory;
+    }
+
     /**
      * Returns Releasing Options
      *
diff --git a/Mage/Console.php b/Mage/Console.php
index f1d7609..ea578cc 100644
--- a/Mage/Console.php
+++ b/Mage/Console.php
@@ -26,7 +26,6 @@ use SplFileInfo;
 class Console
 {
     /**
-     * TODO refactor into own static class
      * @var array
      */
     public static $paramsNotRequiringEnvironment = array('install' => 'install', 'upgrade' => 'upgrade', 'version' => 'version');
diff --git a/Mage/Task/BuiltIn/Deployment/ReleaseTask.php b/Mage/Task/BuiltIn/Deployment/ReleaseTask.php
index ceeab5f..02eeb49 100644
--- a/Mage/Task/BuiltIn/Deployment/ReleaseTask.php
+++ b/Mage/Task/BuiltIn/Deployment/ReleaseTask.php
@@ -133,7 +133,7 @@ class ReleaseTask extends AbstractTask implements IsReleaseAware, SkipOnOverride
                             $directoryToDelete = $releasesDirectory . '/' . $releaseIdToDelete;
                             if ($directoryToDelete != '/') {
                                 $command = 'rm -rf ' . $directoryToDelete;
-                                $result = $result && $this->runCommandRemote($command);
+                                $result = $this->runCommandRemote($command);
                             }
                         }
                     }
diff --git a/Mage/Task/BuiltIn/Scm/CloneTask.php b/Mage/Task/BuiltIn/Scm/CloneTask.php
index f30085f..c55dd87 100644
--- a/Mage/Task/BuiltIn/Scm/CloneTask.php
+++ b/Mage/Task/BuiltIn/Scm/CloneTask.php
@@ -53,6 +53,15 @@ class CloneTask extends AbstractTask
                 $this->name = 'SCM Clone (GIT) [built-in]';
                 break;
         }
+
+        // Create temporal directory for clone
+        if (is_array($this->source)) {
+            if (trim($this->source['temporal']) == '') {
+                $this->source['temporal'] = sys_get_temp_dir();
+            }
+            $this->source['temporal'] = rtrim($this->source['temporal'], '/') . '/' . md5(microtime()) . '/';
+            $this->getConfig()->setSourceTemporal($this->source['temporal']);
+        }
     }
 
     /**