diff --git a/advagg.install b/advagg.install
index bff5ee9..ea01187 100644
--- a/advagg.install
+++ b/advagg.install
@@ -75,12 +75,20 @@ 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_custom_files_dir');
   variable_del('advagg_gzip_compression');
   variable_del('advagg_async_generation');
+  variable_del('advagg_rebuild_on_flush');
   variable_del('advagg_socket_timeout');
+  variable_del('advagg_checksum_mode');
+  variable_del('advagg_dir_htaccess');
   variable_del('advagg_server_addr');
   variable_del('advagg_enabled');
+  variable_del('advagg_closure');
   variable_del('advagg_debug');
+
+  // Remove cache.inc variables.
+  db_query("DELETE FROM {variable} WHERE name LIKE 'cache_flush_cache_advagg%'");
 }
 
 /**
diff --git a/advagg_css_compress/advagg_css_compress.install b/advagg_css_compress/advagg_css_compress.install
index 7e601c4..d044e6e 100644
--- a/advagg_css_compress/advagg_css_compress.install
+++ b/advagg_css_compress/advagg_css_compress.install
@@ -31,14 +31,18 @@ function advagg_css_compress_disable() {
  * Implementation of hook_uninstall().
  */
 function advagg_css_compress_uninstall() {
-  // Remove variables.
-  variable_del('advagg_css_compress_preserve_css');
-
   // 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_preserve_css');
+  variable_del('advagg_css_compress_agg_files');
+  variable_del('advagg_css_compress_inline');
+  variable_del('advagg_css_compressor');
+
 }
 
 /**
diff --git a/advagg_js_compress/advagg_js_compress.install b/advagg_js_compress/advagg_js_compress.install
index 9a7aa03..e2d3a93 100644
--- a/advagg_js_compress/advagg_js_compress.install
+++ b/advagg_js_compress/advagg_js_compress.install
@@ -35,8 +35,11 @@ function advagg_js_compress_disable() {
  */
 function advagg_js_compress_uninstall() {
   // Remove variables.
+  variable_del('advagg_js_compress_packer_enable');
+  variable_del('advagg_js_compress_agg_files');
   variable_del('advagg_js_compress_callback');
-
+  variable_del('advagg_js_compress_inline');
+  variable_del('advagg_js_compressor');
 }
 
 /**