diff --git a/goss-cleanup.rb b/goss-cleanup.rb
index 3aa7faa..06a7c31 100644
--- a/goss-cleanup.rb
+++ b/goss-cleanup.rb
@@ -76,11 +76,11 @@ class GossamerForumsCleaner
 
   def perform_cleanup
     puts "Cleanup beginning!"
-    cleanup_messages
+#    cleanup_messages
     cleanup_posts
     cleanup_topics
-    cleanup_categories
-    cleanup_users
+#    cleanup_categories
+#    cleanup_users
     puts "Cleanup complete!"
   end
 end
diff --git a/gossamer_forums.rb b/gossamer_forums.rb
index 7a6cb0a..1431af0 100644
--- a/gossamer_forums.rb
+++ b/gossamer_forums.rb
@@ -47,12 +47,12 @@ class GossamerForumsImporter < ImportScripts::Base
     @db = SQLite3::Database.new '/bitnami/discourse/sqlite/id_name_url_map.db'
 
 ###### ONLY when we need to clear the url_map and topic_import_status .... e.g. if reimporting topics-posts from scratch
-#    @db.execute <<-SQL
-#      DROP TABLE IF EXISTS url_map;
-#    SQL
-#    @db.execute <<-SQL
-#      DROP TABLE IF EXISTS topic_import_status;
-#    SQL
+    @db.execute <<-SQL
+      DROP TABLE IF EXISTS url_map;
+    SQL
+    @db.execute <<-SQL
+      DROP TABLE IF EXISTS topic_import_status;
+    SQL
 
     @db.execute <<-SQL
       CREATE TABLE IF NOT EXISTS user_id_map (