diff --git a/app/models/guidance.rb b/app/models/guidance.rb
index 31f9012..3b15e2a 100644
--- a/app/models/guidance.rb
+++ b/app/models/guidance.rb
@@ -15,6 +15,9 @@
   belongs_to :guidance_group
 #  belongs_to :question
   has_and_belongs_to_many :themes, join_table: "themes_in_guidance"
+# depricated, but required for migration "single_group_for_guidance"
+  has_and_belongs_to_many :guidance_groups, join_table: "guidance_in_group"
+
 
 
 
diff --git a/db/migrate/20161205095625_replacing_plan_roles_with_bitflags.rb b/db/migrate/20161205095625_replacing_plan_roles_with_bitflags.rb
index 859586c..d4b3e9a 100644
--- a/db/migrate/20161205095625_replacing_plan_roles_with_bitflags.rb
+++ b/db/migrate/20161205095625_replacing_plan_roles_with_bitflags.rb
@@ -19,7 +19,11 @@
         if role.create
           role.creator = true
         end
-        role.save!
+        if role.user.nil?
+          Role.delete_all(user_id: role.user_id)
+        else
+          role.save!
+        end
       end
     end
     
diff --git a/db/migrate/20161206122926_add_foreign_keys.rb b/db/migrate/20161206122926_add_foreign_keys.rb
index 7574279..ec23b90 100644
--- a/db/migrate/20161206122926_add_foreign_keys.rb
+++ b/db/migrate/20161206122926_add_foreign_keys.rb
@@ -107,12 +107,19 @@
     if table_exists?('notes')
       Note.includes(:answer, :user).find_each do |note|
         if note.answer.nil? && note.answer_id.present?
-          note.answer_id = nil
+          note.destroy!
           i += 1
+          next
         end
         if note.user.nil? && note.user_id.present?
-          note.user_id = nil
+          note.destroy!
           i += 1
+          next
+        end
+        if note.text.blank?
+          note.destroy!
+          i += 1
+          next
         end
         note.save!
       end