diff --git a/app/models/commit.rb b/app/models/commit.rb
index f5d1e242e75..1829fecc616 100644
--- a/app/models/commit.rb
+++ b/app/models/commit.rb
@@ -12,11 +12,11 @@ class Commit
 
   attr_accessor :project
 
-  DIFF_SAFE_LINES ||= Gitlab::Git::DiffCollection::DEFAULT_LIMITS[:max_lines]
+  DIFF_SAFE_LINES = Gitlab::Git::DiffCollection::DEFAULT_LIMITS[:max_lines]
 
   # Commits above this size will not be rendered in HTML
-  DIFF_HARD_LIMIT_FILES ||= 1000
-  DIFF_HARD_LIMIT_LINES ||= 50000
+  DIFF_HARD_LIMIT_FILES = 1000
+  DIFF_HARD_LIMIT_LINES = 50000
 
   class << self
     def decorate(commits, project)
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index e410febdfff..47da154dd81 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -27,9 +27,6 @@
 #  merge_commit_sha          :string
 #
 
-require Rails.root.join("app/models/commit")
-require Rails.root.join("lib/static_model")
-
 class MergeRequest < ActiveRecord::Base
   include InternalId
   include Issuable
diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb
index 33884118595..0580cafdd1b 100644
--- a/app/models/merge_request_diff.rb
+++ b/app/models/merge_request_diff.rb
@@ -11,8 +11,6 @@
 #  updated_at       :datetime
 #
 
-require Rails.root.join("app/models/commit")
-
 class MergeRequestDiff < ActiveRecord::Base
   include Sortable
 
diff --git a/lib/file_size_validator.rb b/lib/file_size_validator.rb
index 7b136c2bbe5..440dd44ece7 100644
--- a/lib/file_size_validator.rb
+++ b/lib/file_size_validator.rb
@@ -1,9 +1,9 @@
 class FileSizeValidator < ActiveModel::EachValidator
-  MESSAGES ||= { is: :wrong_size, minimum: :size_too_small, maximum: :size_too_big }.freeze
-  CHECKS   ||= { is: :==, minimum: :>=, maximum: :<= }.freeze
+  MESSAGES = { is: :wrong_size, minimum: :size_too_small, maximum: :size_too_big }.freeze
+  CHECKS   = { is: :==, minimum: :>=, maximum: :<= }.freeze
 
-  DEFAULT_TOKENIZER ||= -> (value) { value.split(//) }.freeze
-  RESERVED_OPTIONS  ||= [:minimum, :maximum, :within, :is, :tokenizer, :too_short, :too_long].freeze
+  DEFAULT_TOKENIZER = -> (value) { value.split(//) }.freeze
+  RESERVED_OPTIONS  = [:minimum, :maximum, :within, :is, :tokenizer, :too_short, :too_long].freeze
 
   def initialize(options)
     if range = (options.delete(:in) || options.delete(:within))