diff --git a/features_plumber.module b/features_plumber.module
index ba72937..e5cc16f 100644
--- a/features_plumber.module
+++ b/features_plumber.module
@@ -36,19 +36,5 @@ function features_plumber_features_export_alter(&$export, $module_name) {
  * Check to see if a feature component is supported by this module.
  */
 function features_plumber_component_is_supported($component) {
-  return in_array($component, features_plumber_supported_components());
-}
-
-/**
- * Return an array of supported components by this module.
- */
-function features_plumber_supported_components() {
-  return array(
-    'views',
-    'variable',
-    'box',
-    'context',
-    'field',
-    'dependencies',
-  );
+  return features_get_components($component);
 }
diff --git a/includes/features_plumber.export.inc b/includes/features_plumber.export.inc
index 1851dbd..7a68936 100644
--- a/includes/features_plumber.export.inc
+++ b/includes/features_plumber.export.inc
@@ -45,6 +45,8 @@ function _features_plumber_features_export_alter(&$export, $module_name) {
     $function = "features_plumber_export_{$component}_cleanup";
     if (function_exists($function)) {
       $function($export, $module_name);
+    } else {
+      _features_plumber_export_ctools_cleanup($component, $export);
     }
   }
 }