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..6eb4b7e 100644
--- a/lib/Drupal/configuration/Config/ConfigurationManagement.php
+++ b/lib/Drupal/configuration/Config/ConfigurationManagement.php
@@ -179,7 +179,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(
@@ -197,8 +197,16 @@ class ConfigurationManagement {
       $config->iterate($settings);
     }
 
-    //@TODO: Delete the file from the DataStore.
+    $tracked = static::trackedConfigurations();
+    $args = array();
+    foreach ($tracked as $component => $list) {
+      foreach ($list as $identifier => $hash) {
+        $id = $component . '.' . $identifier;
+        $args[] = $id;
+      }
+    }
 
+    static::exportToDataStore($args, TRUE, TRUE, TRUE);
     return $settings;
   }
 
diff --git a/lib/Drupal/configuration/Storage/Storage.php b/lib/Drupal/configuration/Storage/Storage.php
index 41a5a15..f016c1f 100644
--- a/lib/Drupal/configuration/Storage/Storage.php
+++ b/lib/Drupal/configuration/Storage/Storage.php
@@ -36,6 +36,31 @@ 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 {
+      drupal_set_message(t('The current user do not have write permissions in the directory %dir.', array('%dir' => $dir_path)), 'error');
+    }
+  }
+
   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;
   }
 
