diff --git a/advagg.install b/advagg.install
index 9236010..c6719cc 100644
--- a/advagg.install
+++ b/advagg.install
@@ -78,12 +78,21 @@ function advagg_uninstall() {
   variable_del('advagg_stale_file_last_used_threshold');
   variable_del('advagg_file_last_used_interval');
   variable_del('advagg_stale_file_threshold');
+  variable_del('advagg_async_socket_connect');
+  variable_del('advagg_css_render_function');
+  variable_del('advagg_file_save_function');
+  variable_del('advagg_js_render_function');
+  variable_del('advagg_bundle_built_mode');
+  variable_del('advagg_strict_js_bundles');
   variable_del('advagg_custom_files_dir');
   variable_del('advagg_gzip_compression');
   variable_del('advagg_async_generation');
   variable_del('advagg_rebuild_on_flush');
+  variable_del('advagg_page_cache_mode');
   variable_del('advagg_socket_timeout');
+  variable_del('advagg_aggregate_mode');
   variable_del('advagg_checksum_mode');
+  variable_del('advagg_prune_on_cron');
   variable_del('advagg_dir_htaccess');
   variable_del('advagg_server_addr');
   variable_del('advagg_enabled');
diff --git a/advagg_bundler/advagg_bundler.install b/advagg_bundler/advagg_bundler.install
index 2c77af8..ad8c182 100644
--- a/advagg_bundler/advagg_bundler.install
+++ b/advagg_bundler/advagg_bundler.install
@@ -32,9 +32,10 @@ function advagg_bundler_disable() {
  */
 function advagg_bundler_uninstall() {
   // Remove variables.
+  variable_del('advagg_bundler_outdated');
   variable_del('advagg_bundler_max_css');
   variable_del('advagg_bundler_max_js');
-
+  variable_del('advagg_bundler_active');
 }
 
 /**
diff --git a/advagg_css_compress/advagg_css_compress.install b/advagg_css_compress/advagg_css_compress.install
index 7ae314b..b656a79 100644
--- a/advagg_css_compress/advagg_css_compress.install
+++ b/advagg_css_compress/advagg_css_compress.install
@@ -38,12 +38,6 @@ function advagg_css_compress_install() {
  * Implementation of hook_uninstall().
  */
 function advagg_css_compress_uninstall() {
-  // Flush advagg caches.
-  $cache_tables = advagg_flush_caches();
-  foreach ($cache_tables as $table) {
-    cache_clear_all('*', $table, TRUE);
-  }
-
   // Remove variables.
   variable_del('advagg_css_compress_compressor_level');
   variable_del('advagg_css_compress_preserve_css');
diff --git a/advagg_js_compress/advagg_js_compress.install b/advagg_js_compress/advagg_js_compress.install
index fcf6a54..1f7b44e 100644
--- a/advagg_js_compress/advagg_js_compress.install
+++ b/advagg_js_compress/advagg_js_compress.install
@@ -41,17 +41,15 @@ function advagg_js_compress_install() {
  * Implementation of hook_uninstall().
  */
 function advagg_js_compress_uninstall() {
-  // Flush advagg caches.
-  $cache_tables = advagg_flush_caches();
-  foreach ($cache_tables as $table) {
-    cache_clear_all('*', $table, TRUE);
-  }
-
   // Remove variables.
   variable_del('advagg_js_compress_packer_enable');
+  variable_del('advagg_js_compress_inline_cache');
+  variable_del('advagg_js_compress_file_cache');
   variable_del('advagg_js_compress_agg_files');
+  variable_del('advagg_js_max_compress_ratio');
   variable_del('advagg_js_compress_callback');
   variable_del('advagg_js_compress_inline');
+  variable_del('advagg_js_compress_ratio');
   variable_del('advagg_js_compressor');
 
   // Remove our cache table.