diff --git a/features/ns_article_comment/ns_article_comment.features.field.inc b/features/ns_article_comment/ns_article_comment.features.field.inc
deleted file mode 100644
index dbde959..0000000
--- a/features/ns_article_comment/ns_article_comment.features.field.inc
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/**
- * @file
- * ns_article_comment.features.field.inc
- */
-
-/**
- * Implements hook_defaultconfig_field_default_fields().
- */
-function ns_article_comment_defaultconfig_field_default_fields() {
-  $fields = array();
-
-  // Exported field: 'comment-comment_node_ns_article-comment_body'
-  $fields['comment-comment_node_ns_article-comment_body'] = array(
-    'field_config' => array(
-      'active' => '1',
-      'cardinality' => '1',
-      'deleted' => '0',
-      'entity_types' => array(
-        0 => 'comment',
-      ),
-      'field_name' => 'comment_body',
-      'foreign keys' => array(
-        'format' => array(
-          'columns' => array(
-            'format' => 'format',
-          ),
-          'table' => 'filter_format',
-        ),
-      ),
-      'indexes' => array(
-        'format' => array(
-          0 => 'format',
-        ),
-      ),
-      'module' => 'text',
-      'settings' => array(),
-      'translatable' => '1',
-      'type' => 'text_long',
-    ),
-    'field_instance' => array(
-      'bundle' => 'comment_node_ns_article',
-      'default_value' => NULL,
-      'deleted' => '0',
-      'description' => '',
-      'display' => array(
-        'default' => array(
-          'label' => 'hidden',
-          'module' => 'text',
-          'settings' => array(),
-          'type' => 'text_plain',
-          'weight' => '0',
-        ),
-      ),
-      'entity_type' => 'comment',
-      'field_name' => 'comment_body',
-      'label' => 'Comment',
-      'required' => 1,
-      'settings' => array(
-        'text_processing' => '0',
-        'user_register_form' => FALSE,
-      ),
-      'widget' => array(
-        'active' => 1,
-        'module' => 'text',
-        'settings' => array(
-          'rows' => '5',
-        ),
-        'type' => 'text_textarea',
-        'weight' => 0,
-      ),
-    ),
-  );
-
-  // Translatables
-  // Included for use with string extractors like potx.
-  t('Comment');
-
-  return $fields;
-}
diff --git a/features/ns_article_comment/ns_article_comment.features.inc b/features/ns_article_comment/ns_article_comment.features.inc
deleted file mode 100644
index 3067428..0000000
--- a/features/ns_article_comment/ns_article_comment.features.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/**
- * @file
- * ns_article_comment.features.inc
- */
-
-/**
- * Implements hook_ctools_plugin_api().
- */
-function ns_article_comment_ctools_plugin_api() {
-  list($module, $api) = func_get_args();
-  if ($module == "strongarm" && $api == "strongarm") {
-    return array("version" => "1");
-  }
-}
diff --git a/features/ns_article_comment/ns_article_comment.info b/features/ns_article_comment/ns_article_comment.info
deleted file mode 100644
index cc29574..0000000
--- a/features/ns_article_comment/ns_article_comment.info
+++ /dev/null
@@ -1,12 +0,0 @@
-core = "7.x"
-dependencies[] = "comment"
-dependencies[] = "features"
-dependencies[] = "strongarm"
-dependencies[] = "uuid_comment"
-dependencies[] = "defaultconfig"
-description = "Enables comments for articles using the standard Drupal comments system."
-features[ctools][] = "strongarm:strongarm:1"
-name = "Article Comments"
-nodestream_type = "extension"
-package = "Extensions"
-php = "5.2.4"
diff --git a/features/ns_article_comment/ns_article_comment.install b/features/ns_article_comment/ns_article_comment.install
deleted file mode 100644
index 66abdd4..0000000
--- a/features/ns_article_comment/ns_article_comment.install
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/**
- * @file
- * This file contains enable and disable hooks for the feature.
- */
-
-/**
- * Implements hook_enable().
- * Delete the ns_article_comment variable from the database if it exists.
- * It will be handled by the feature from now on.
- */
-function ns_article_comment_enable() {
-  variable_del('comment_ns_article');
-}
-
-/**
- * Implements hook_disable().
- * Make sure comments are disabled by default when we disable the feature.
- */
-function ns_article_comment_disable() {
-  variable_set('comment_ns_article', 0);
-}
diff --git a/features/ns_article_comment/ns_article_comment.module b/features/ns_article_comment/ns_article_comment.module
deleted file mode 100644
index 38e5df1..0000000
--- a/features/ns_article_comment/ns_article_comment.module
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-/**
- * @file
- * Code for the NS Article Comment feature.
- */
-
-include_once('ns_article_comment.features.inc');
diff --git a/features/ns_article_comment/ns_article_comment.strongarm.inc b/features/ns_article_comment/ns_article_comment.strongarm.inc
deleted file mode 100644
index 6977978..0000000
--- a/features/ns_article_comment/ns_article_comment.strongarm.inc
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/**
- * @file
- * ns_article_comment.strongarm.inc
- */
-
-/**
- * Implements hook_strongarm().
- */
-function ns_article_comment_defaultconfig_strongarm() {
-  $export = array();
-
-  $strongarm = new stdClass;
-  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
-  $strongarm->api_version = 1;
-  $strongarm->name = 'comment_anonymous_ns_article';
-  $strongarm->value = 0;
-  $export['comment_anonymous_ns_article'] = $strongarm;
-
-  $strongarm = new stdClass;
-  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
-  $strongarm->api_version = 1;
-  $strongarm->name = 'comment_default_mode_ns_article';
-  $strongarm->value = 1;
-  $export['comment_default_mode_ns_article'] = $strongarm;
-
-  $strongarm = new stdClass;
-  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
-  $strongarm->api_version = 1;
-  $strongarm->name = 'comment_default_per_page_ns_article';
-  $strongarm->value = '50';
-  $export['comment_default_per_page_ns_article'] = $strongarm;
-
-  $strongarm = new stdClass;
-  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
-  $strongarm->api_version = 1;
-  $strongarm->name = 'comment_form_location_ns_article';
-  $strongarm->value = 1;
-  $export['comment_form_location_ns_article'] = $strongarm;
-
-  $strongarm = new stdClass;
-  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
-  $strongarm->api_version = 1;
-  $strongarm->name = 'comment_ns_article';
-  $strongarm->value = 0;
-  $export['comment_ns_article'] = $strongarm;
-
-  $strongarm = new stdClass;
-  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
-  $strongarm->api_version = 1;
-  $strongarm->name = 'comment_preview_ns_article';
-  $strongarm->value = '0';
-  $export['comment_preview_ns_article'] = $strongarm;
-
-  $strongarm = new stdClass;
-  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
-  $strongarm->api_version = 1;
-  $strongarm->name = 'comment_subject_field_ns_article';
-  $strongarm->value = 0;
-  $export['comment_subject_field_ns_article'] = $strongarm;
-
-  return $export;
-}
diff --git a/features/ns_blog_comment/ns_blog_comment.features.field.inc b/features/ns_blog_comment/ns_blog_comment.features.field.inc
deleted file mode 100644
index 9ffb619..0000000
--- a/features/ns_blog_comment/ns_blog_comment.features.field.inc
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/**
- * @file
- * ns_blog_comment.features.field.inc
- */
-
-/**
- * Implements hook_defaultconfig_field_default_fields().
- */
-function ns_blog_comment_defaultconfig_field_default_fields() {
-  $fields = array();
-
-  // Exported field: 'comment-comment_node_ns_blog_post-comment_body'
-  $fields['comment-comment_node_ns_blog_post-comment_body'] = array(
-    'field_config' => array(
-      'active' => '1',
-      'cardinality' => '1',
-      'deleted' => '0',
-      'entity_types' => array(
-        0 => 'comment',
-      ),
-      'field_name' => 'comment_body',
-      'foreign keys' => array(
-        'format' => array(
-          'columns' => array(
-            'format' => 'format',
-          ),
-          'table' => 'filter_format',
-        ),
-      ),
-      'indexes' => array(
-        'format' => array(
-          0 => 'format',
-        ),
-      ),
-      'module' => 'text',
-      'settings' => array(),
-      'translatable' => '1',
-      'type' => 'text_long',
-    ),
-    'field_instance' => array(
-      'bundle' => 'comment_node_ns_blog_post',
-      'default_value' => NULL,
-      'deleted' => '0',
-      'description' => '',
-      'display' => array(
-        'default' => array(
-          'label' => 'hidden',
-          'module' => 'text',
-          'settings' => array(),
-          'type' => 'text_default',
-          'weight' => 0,
-        ),
-      ),
-      'entity_type' => 'comment',
-      'field_name' => 'comment_body',
-      'label' => 'Comment',
-      'required' => 1,
-      'settings' => array(
-        'text_processing' => '0',
-        'user_register_form' => FALSE,
-      ),
-      'widget' => array(
-        'active' => 1,
-        'module' => 'text',
-        'settings' => array(
-          'rows' => '5',
-        ),
-        'type' => 'text_textarea',
-        'weight' => 0,
-      ),
-    ),
-  );
-
-  // Translatables
-  // Included for use with string extractors like potx.
-  t('Comment');
-
-  return $fields;
-}
diff --git a/features/ns_blog_comment/ns_blog_comment.features.inc b/features/ns_blog_comment/ns_blog_comment.features.inc
deleted file mode 100644
index ce6c9cd..0000000
--- a/features/ns_blog_comment/ns_blog_comment.features.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/**
- * @file
- * ns_blog_comment.features.inc
- */
-
-/**
- * Implements hook_ctools_plugin_api().
- */
-function ns_blog_comment_ctools_plugin_api() {
-  list($module, $api) = func_get_args();
-  if ($module == "strongarm" && $api == "strongarm") {
-    return array("version" => "1");
-  }
-}
diff --git a/features/ns_blog_comment/ns_blog_comment.info b/features/ns_blog_comment/ns_blog_comment.info
deleted file mode 100644
index 0ef299c..0000000
--- a/features/ns_blog_comment/ns_blog_comment.info
+++ /dev/null
@@ -1,13 +0,0 @@
-core = "7.x"
-dependencies[] = "comment"
-dependencies[] = "features"
-dependencies[] = "ns_blog"
-dependencies[] = "strongarm"
-dependencies[] = "uuid_comment"
-dependencies[] = "defaultconfig"
-description = "Enables comments for blog posts using the standard Drupal comments system."
-features[ctools][] = "strongarm:strongarm:1"
-name = "Blog Comments"
-nodestream_type = "extension"
-package = "Extensions"
-php = "5.2.4"
diff --git a/features/ns_blog_comment/ns_blog_comment.install b/features/ns_blog_comment/ns_blog_comment.install
deleted file mode 100644
index 824ed9a..0000000
--- a/features/ns_blog_comment/ns_blog_comment.install
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/**
- * @file
- * This file contains enable and disable hooks for the feature.
- */
-
-/**
- * Implements hook_enable().
- * Delete the ns_blog_comment variable from the database if it exists.
- * It will be handled by the feature from now on.
- */
-function ns_blog_comment_enable() {
-  variable_del('comment_ns_blog_post');
-}
-
-/**
- * Implements hook_disable().
- * Make sure comments are disabled by default when we disable the feature.
- */
-function ns_blog_comment_disable() {
-  variable_set('comment_ns_blog_post', 0);
-}
diff --git a/features/ns_blog_comment/ns_blog_comment.module b/features/ns_blog_comment/ns_blog_comment.module
deleted file mode 100644
index 017310a..0000000
--- a/features/ns_blog_comment/ns_blog_comment.module
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-/**
- * @file
- */
-
-include_once('ns_blog_comment.features.inc');
\ No newline at end of file
diff --git a/features/ns_blog_comment/ns_blog_comment.strongarm.inc b/features/ns_blog_comment/ns_blog_comment.strongarm.inc
deleted file mode 100644
index 4a2bbc8..0000000
--- a/features/ns_blog_comment/ns_blog_comment.strongarm.inc
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/**
- * @file
- * ns_blog_comment.strongarm.inc
- */
-
-/**
- * Implements hook_strongarm().
- */
-function ns_blog_comment_defaultconfig_strongarm() {
-  $export = array();
-
-  $strongarm = new stdClass;
-  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
-  $strongarm->api_version = 1;
-  $strongarm->name = 'comment_anonymous_ns_blog_post';
-  $strongarm->value = 0;
-  $export['comment_anonymous_ns_blog_post'] = $strongarm;
-
-  $strongarm = new stdClass;
-  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
-  $strongarm->api_version = 1;
-  $strongarm->name = 'comment_default_mode_ns_blog_post';
-  $strongarm->value = 1;
-  $export['comment_default_mode_ns_blog_post'] = $strongarm;
-
-  $strongarm = new stdClass;
-  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
-  $strongarm->api_version = 1;
-  $strongarm->name = 'comment_default_per_page_ns_blog_post';
-  $strongarm->value = '50';
-  $export['comment_default_per_page_ns_blog_post'] = $strongarm;
-
-  $strongarm = new stdClass;
-  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
-  $strongarm->api_version = 1;
-  $strongarm->name = 'comment_form_location_ns_blog_post';
-  $strongarm->value = 1;
-  $export['comment_form_location_ns_blog_post'] = $strongarm;
-
-  $strongarm = new stdClass;
-  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
-  $strongarm->api_version = 1;
-  $strongarm->name = 'comment_ns_blog_post';
-  $strongarm->value = '2';
-  $export['comment_ns_blog_post'] = $strongarm;
-
-  $strongarm = new stdClass;
-  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
-  $strongarm->api_version = 1;
-  $strongarm->name = 'comment_preview_ns_blog_post';
-  $strongarm->value = '0';
-  $export['comment_preview_ns_blog_post'] = $strongarm;
-
-  $strongarm = new stdClass;
-  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
-  $strongarm->api_version = 1;
-  $strongarm->name = 'comment_subject_field_ns_blog_post';
-  $strongarm->value = 0;
-  $export['comment_subject_field_ns_blog_post'] = $strongarm;
-
-  return $export;
-}