diff --git a/app/controllers/registrar/sessions_controller.rb b/app/controllers/registrar/sessions_controller.rb
index 02ff6079e..33d1bd272 100644
--- a/app/controllers/registrar/sessions_controller.rb
+++ b/app/controllers/registrar/sessions_controller.rb
@@ -9,6 +9,7 @@ class Registrar::SessionsController < ::SessionsController
     @depp_user = Depp::User.new
   end
 
+  # rubocop:disabled Metrics/PerceivedComplexity
   def create
     @depp_user = Depp::User.new(params[:depp_user].merge(
         pki: request.env['HTTP_SSL_CLIENT_S_DN_CN'].present?
@@ -32,6 +33,7 @@ class Registrar::SessionsController < ::SessionsController
       render 'login'
     end
   end
+  # rubocop:enabled Metrics/PerceivedComplexity
 
   def login_mid
     @user = User.new
diff --git a/app/models/address.rb b/app/models/address.rb
index c26c8c37a..a26b0bd28 100644
--- a/app/models/address.rb
+++ b/app/models/address.rb
@@ -1,6 +1,5 @@
 class Address < ActiveRecord::Base
   include Versions # version/address_version.rb
-  belongs_to :country_deprecated, foreign_key: :country_id
 
   LOCAL_TYPE_SHORT = 'loc'
   INTERNATIONAL_TYPE_SHORT = 'int'
diff --git a/app/models/admin_user.rb b/app/models/admin_user.rb
index a5dfc6f91..b1682a715 100644
--- a/app/models/admin_user.rb
+++ b/app/models/admin_user.rb
@@ -5,7 +5,6 @@ class AdminUser < User
   validates :email, presence: true 
 
   validate :validate_identity_code, if: -> { country_code == 'EE' }
-  belongs_to :country_deprecated, foreign_key: :country_id
 
   ROLES = %w(user customer_service admin)
 
diff --git a/app/models/registrar.rb b/app/models/registrar.rb
index bd529d3d7..fdff0426e 100644
--- a/app/models/registrar.rb
+++ b/app/models/registrar.rb
@@ -10,8 +10,6 @@ class Registrar < ActiveRecord::Base
   has_many :nameservers, through: :domains
   has_many :whois_records
 
-  belongs_to :country_deprecated, foreign_key: :country_id
-
   validates :name, :reg_no, :country_code, :email, :code, presence: true
   validates :name, :reg_no, :reference_no, :code, uniqueness: true
   validate :forbidden_codes