diff --git a/app/models/annotation.rb b/app/models/annotation.rb
index cba78ff2b..0ee80760f 100644
--- a/app/models/annotation.rb
+++ b/app/models/annotation.rb
@@ -1,6 +1,4 @@
 class Annotation < ApplicationRecord
-  # FIXME: - We should start using strong parameters here in favor of this below
-  # include ActiveModel::MassAssignmentSecurity
   belongs_to :map, optional: true
   belongs_to :user, optional: true
 
diff --git a/app/models/user.rb b/app/models/user.rb
index d40a02ca0..6dd1352b6 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -16,8 +16,7 @@ class User < ApplicationRecord
   validates_length_of       :email, within: 6..100 # r@a.wk
   validates_uniqueness_of   :email
 
-  # HACK: HACK HACK -- how to do attr_accessor from here?
-  # prevents a user from submitting a crafted form that bypasses activation
+  # Prevents a user from submitting a crafted form that bypasses activation
   # anything else you want your user to change should be added here.
 
   # Authenticates a user by their login name and unencrypted password.  Returns the user or nil.
diff --git a/app/models/warpable.rb b/app/models/warpable.rb
index 9c255baa2..fef962645 100755
--- a/app/models/warpable.rb
+++ b/app/models/warpable.rb
@@ -1,7 +1,4 @@
 class Warpable < ApplicationRecord
-  # FIXME: - We should start using strong parameters here in favor of this below
-  # include ActiveModel::MassAssignmentSecurity
-  # attr_accessible :image
 
   attr_accessor :image
   attr_accessor :src, :srcmedium # for json generation