diff --git a/configuration.drush.inc b/configuration.drush.inc
index b8c375d..9c8a118 100644
--- a/configuration.drush.inc
+++ b/configuration.drush.inc
@@ -472,12 +472,14 @@ function _configuration_stop_tracking() {
   $stop_tracking_dependencies = !drush_get_option('exclude-dependencies');
   $stop_tracking_optionals = !drush_get_option('exclude-optionals');
   $result = ConfigurationManagement::stopTracking($args, $stop_tracking_dependencies, $stop_tracking_optionals);
-  foreach ($result->getInfo('untracked') as $untracked) {
-    $rows[]['untracked'] = $untracked;
+  $configurations = $result->getInfo('untracked');
+  if (!empty($configurations)) {
+    foreach ($configurations as $untracked) {
+      $rows[]['untracked'] = $untracked;
+    }
+    drush_log(dt('The configurations changes for for the following items are not being tracked anymore.'), 'ok');
+    drush_print_table($rows);
   }
-
-  drush_log(dt('The configurations changes for for the following items are not being tracked anymore.'), 'ok');
-  drush_print_table($rows);
 }
 
 function _configuration_import_configurations() {
diff --git a/lib/Drupal/configuration/Config/Configuration.php b/lib/Drupal/configuration/Config/Configuration.php
index d5c0955..6d461ee 100644
--- a/lib/Drupal/configuration/Config/Configuration.php
+++ b/lib/Drupal/configuration/Config/Configuration.php
@@ -236,6 +236,15 @@ class Configuration {
    * Removes the configuration record from the configuration_staging table for
    * the current configuration.
    */
+  public function removeConfiguration(ConfigIteratorSettings &$settings) {
+    $this->removeFromStaging($settings);
+    $this->removeFromDataStore($settings);
+  }
+
+  /**
+   * Removes the configuration record from the configuration_staging table for
+   * the current configuration.
+   */
   public function removeFromStaging(ConfigIteratorSettings &$settings) {
     $deleted = db_delete('configuration_staging')
       ->condition('component', $this->getComponent())
@@ -247,6 +256,14 @@ class Configuration {
     }
   }
 
+
+  /**
+   * Removes the configuration file from the dataStore folder.
+   */
+  public function removeFromDataStore(ConfigIteratorSettings &$settings) {
+    $this->storage->delete();
+  }
+
   /**
    * Load a configuration from the DataStore and save it into the ActiveStore.
    * This function is called from iterator().
diff --git a/lib/Drupal/configuration/Config/ConfigurationManagement.php b/lib/Drupal/configuration/Config/ConfigurationManagement.php
index 72016b7..a76abed 100644
--- a/lib/Drupal/configuration/Config/ConfigurationManagement.php
+++ b/lib/Drupal/configuration/Config/ConfigurationManagement.php
@@ -10,6 +10,7 @@ namespace Drupal\configuration\Config;
 use \StdClass;
 use Drupal\configuration\Config\Configuration;
 use Drupal\configuration\Utils\ConfigIteratorSettings;
+use Drupal\configuration\Storage\Storage;
 
 class ConfigurationManagement {
 
@@ -179,7 +180,7 @@ class ConfigurationManagement {
     $settings = new ConfigIteratorSettings(
       array(
         'build_callback' => 'build',
-        'callback' => 'removeFromStaging',
+        'callback' => 'removeConfiguration',
         'process_dependencies' => $stop_track_dependencies,
         'process_optionals' => $stop_track_optionals,
         'info' => array(
@@ -187,18 +188,28 @@ class ConfigurationManagement {
         )
       )
     );
+    if (Storage::checkFilePermissions('tracked.inc')) {
+      foreach ($list as $component) {
+        $config = static::createConfigurationInstance($component);
+
+        // Make sure the object is built before start to iterate on its
+        // dependencies.
+        $config->build();
+        $config->iterate($settings);
+      }
 
-    foreach ($list as $component) {
-      $config = static::createConfigurationInstance($component);
+      $tracked = static::trackedConfigurations();
+      $args = array();
+      foreach ($tracked as $component => $list) {
+        foreach ($list as $identifier => $hash) {
+          $id = $component . '.' . $identifier;
+          $args[] = $id;
+        }
+      }
 
-      // Make sure the object is built before start to iterate on its
-      // dependencies.
-      $config->build();
-      $config->iterate($settings);
+      static::exportToDataStore($args, TRUE, TRUE, TRUE);
     }
 
-    //@TODO: Delete the file from the DataStore.
-
     return $settings;
   }
 
@@ -469,7 +480,9 @@ class ConfigurationManagement {
     $file_content = "<?php\n\n";
     $file_content .= "// This file contains the current being tracked configurations.\n\n";
     $file_content .= '$tracked = ' . var_export($file, TRUE) . ";\n";
-    file_put_contents(static::getStream() . 'tracked.inc', $file_content);
+    if (Storage::checkFilePermissions('tracked.inc')) {
+      file_put_contents(static::getStream() . 'tracked.inc', $file_content);
+    }
   }
 
   /**
diff --git a/lib/Drupal/configuration/Storage/Storage.php b/lib/Drupal/configuration/Storage/Storage.php
index 41a5a15..0480a4d 100644
--- a/lib/Drupal/configuration/Storage/Storage.php
+++ b/lib/Drupal/configuration/Storage/Storage.php
@@ -36,6 +36,33 @@ class Storage {
     return file_exists(ConfigurationManagement::getStream() . $component . '.' . $identifier . '.' . static::$file_extension);
   }
 
+  /**
+   * Returns TRUE if the current user has write permissions for a configuration
+   * file in the config:// directory.
+   */
+  static public function checkFilePermissions($filename) {
+    $dir_path = ConfigurationManagement::getStream();
+    $full_path = $dir_path . $filename;
+    if (is_writable($dir_path) || drupal_chmod($dir_path)) {
+      if (file_exists($full_path)) {
+        if (is_writable($full_path) || drupal_chmod($full_path)) {
+          return TRUE;
+        }
+        else {
+          drupal_set_message(t('The current user do not have permissions to edit the file %file.', array('%file' => $full_path)), 'error');
+        }
+      }
+      else {
+        return TRUE;
+      }
+    }
+    else {
+      watchdog('configuration', 'The current user do not have write permissions in the directory %dir.', array('%dir' => $dir_path), WATCHDOG_ERROR);
+      drupal_set_message(t('The current user do not have write permissions in the directory %dir.', array('%dir' => $dir_path)), 'error', FALSE);
+    }
+    return FALSE;
+  }
+
   public function __construct() {
     $this->reset();
   }
diff --git a/lib/Drupal/configuration/Storage/StoragePhp.php b/lib/Drupal/configuration/Storage/StoragePhp.php
index 55f62e7..88428a6 100644
--- a/lib/Drupal/configuration/Storage/StoragePhp.php
+++ b/lib/Drupal/configuration/Storage/StoragePhp.php
@@ -103,7 +103,16 @@ class StoragePhp extends Storage {
   }
 
   public function save() {
-    file_put_contents(ConfigurationManagement::getStream() . $this->filename, $this->getDataToSave());
+    if ($this->checkFilePermissions($this->filename)) {
+      file_put_contents(ConfigurationManagement::getStream() . $this->filename, $this->getDataToSave());
+    }
+    return $this;
+  }
+
+  public function delete() {
+    if ($this->checkFilePermissions($this->filename)) {
+      file_unmanaged_delete(ConfigurationManagement::getStream() . $this->filename);
+    }
     return $this;
   }
 
diff --git a/tests/configuration.test b/tests/configuration.test
index 7974dae..1e32555 100644
--- a/tests/configuration.test
+++ b/tests/configuration.test
@@ -128,13 +128,17 @@ class ConfigurationApiTest extends ConfigurationWebTestCase {
   public function testStartAndStopTracking() {
     $results = ConfigurationManagement::startTracking(array('content_type.article'));
     $exported = $results->getInfo('exported');
-
+    $dirpath = drupal_realpath(ConfigurationManagement::getStream()) . '/';
     $tracked = ConfigurationManagement::trackedConfigurations();
     $non_tracked = ConfigurationManagement::nonTrackedConfigurations();
     foreach ($this->configurations as $id) {
       list($component, $identifier) = explode('.', $id, 2);
+      if (!empty($tracked[$component][$identifier])) {
+        $filename = $dirpath . $id . '.inc';
+        $this->assertTrue(file_exists($filename), t('@filename file was created.', array('@filename' => $filename)));
+      }
       $this->assertTrue(!empty($tracked[$component][$identifier]), t('@id is being tracked', array('@id' => $id)));
-      $this->assertTrue(empty($non_tracked[$component][$identifier]), t('@id is not in the list of untracked configurations', array('@id' => $id)));
+      $this->assertTrue(empty($non_tracked[$component][$identifier]), t('@id is not being tracked', array('@id' => $id)));
     }
 
     $count_tracked = db_query("SELECT COUNT(component) FROM {configuration_staging}")->fetchField();
@@ -148,6 +152,10 @@ class ConfigurationApiTest extends ConfigurationWebTestCase {
     $non_tracked = ConfigurationManagement::nonTrackedConfigurations();
     foreach ($this->configurations as $id) {
       list($component, $identifier) = explode('.', $id, 2);
+      if (empty($tracked[$component][$identifier])) {
+        $filename = $dirpath . $id . '.inc';
+        $this->assertTrue(!file_exists($filename), t('@filename file was deleted.', array('@filename' => $filename)));
+      }
       $this->assertTrue(empty($tracked[$component][$identifier]), t('@id is not being tracked', array('@id' => $id)));
     }
   }
