diff --git a/app/models/organization.rb b/app/models/organization.rb
index e52ce0ae3..dc340b08c 100644
--- a/app/models/organization.rb
+++ b/app/models/organization.rb
@@ -1,6 +1,4 @@
 class Organization < ActiveRecord::Base
-  NAME_LENGTH = {maximum: Organization.columns.find { |c| c.name == 'name' }.limit || 60}
-
   belongs_to :user, touch: true
 
   validates :name, presence: true
diff --git a/lib/tag_sanitizer.rb b/lib/tag_sanitizer.rb
index 4d15a510b..643bca19c 100644
--- a/lib/tag_sanitizer.rb
+++ b/lib/tag_sanitizer.rb
@@ -1,6 +1,4 @@
 class TagSanitizer
-  TAG_MAX_LENGTH = 40
-
   DISALLOWED_STRINGS = %w(? < > = /)
 
   def sanitize_tag(tag)
@@ -8,11 +6,15 @@ class TagSanitizer
     DISALLOWED_STRINGS.each do |s|
       tag.gsub!(s, '')
     end
-    tag.truncate(TAG_MAX_LENGTH)
+    tag.truncate(TagSanitizer.tag_max_length)
   end
 
   def sanitize_tag_list(tag_list)
     tag_list.map { |tag| sanitize_tag(tag) }
   end
 
+  def self.tag_max_length
+    40
+  end
+
 end
diff --git a/spec/lib/tag_sanitizer_spec.rb b/spec/lib/tag_sanitizer_spec.rb
index dde5aa483..f33b771b8 100644
--- a/spec/lib/tag_sanitizer_spec.rb
+++ b/spec/lib/tag_sanitizer_spec.rb
@@ -14,9 +14,9 @@ describe TagSanitizer do
     end
 
     it 'sets up a max length for each tag' do
-      long_tag = '1' * (TagSanitizer::TAG_MAX_LENGTH + 100)
+      long_tag = '1' * (TagSanitizer.tag_max_length + 100)
 
-      expect(subject.sanitize_tag(long_tag).size).to eq(TagSanitizer::TAG_MAX_LENGTH)
+      expect(subject.sanitize_tag(long_tag).size).to eq(TagSanitizer.tag_max_length)
     end
   end