diff --git a/app/controllers/registrar/polls_controller.rb b/app/controllers/registrar/polls_controller.rb
index 76e574e95..e29f02f67 100644
--- a/app/controllers/registrar/polls_controller.rb
+++ b/app/controllers/registrar/polls_controller.rb
@@ -3,12 +3,10 @@ class Registrar::PollsController < Registrar::DeppController # EPP controller
   before_action :init_epp_xml
 
   def show
-    # authorize! :view, :registrar_dashboard
     @data = depp_current_user.request(@ex.poll)
   end
 
   def destroy
-    # authorize! :delete, :registrar_poll
     @data = depp_current_user.request(@ex.poll(poll: {
       value: '', attrs: { op: 'ack', msgID: params[:id] }
     }))
@@ -35,7 +33,6 @@ class Registrar::PollsController < Registrar::DeppController # EPP controller
   # end
 
   def confirm_transfer
-    # authorize! :confirm, :transfer
     domain_params = params[:domain]
     @data = @domain.confirm_transfer(domain_params)
 
diff --git a/app/controllers/registrar/sessions_controller.rb b/app/controllers/registrar/sessions_controller.rb
index 198860f49..ff97c4f2c 100644
--- a/app/controllers/registrar/sessions_controller.rb
+++ b/app/controllers/registrar/sessions_controller.rb
@@ -70,13 +70,6 @@ class Registrar::SessionsController < Devise::SessionsController
         flash[:alert] = I18n.t(:ip_is_not_whitelisted)
         redirect_to :back and return
       end
-
-      # if @api_user.can?(:create, :epp_login)
-      #   unless @api_user.registrar.api_ip_white?(request.ip)
-      #     flash[:alert] = I18n.t(:ip_is_not_whitelisted)
-      #     redirect_to :back and return
-      #   end
-      # end
     end
 
     sign_in @api_user if @api_user.identity_code == current_user.identity_code
diff --git a/app/controllers/registrar_controller.rb b/app/controllers/registrar_controller.rb
index f70b82849..47d596fd3 100644
--- a/app/controllers/registrar_controller.rb
+++ b/app/controllers/registrar_controller.rb
@@ -9,29 +9,20 @@ class RegistrarController < ApplicationController
     false
   end
 
-  # rubocop:disable Metrics/PerceivedComplexity
-  # rubocop:disable Metrics/CyclomaticComplexity
   def check_ip
     return unless current_user
     unless current_user.is_a? ApiUser
       sign_out(current_user)
       return
     end
-    # return if Rails.env.development?
+    return if Rails.env.development?
     registrar_ip_whitelisted = current_user.registrar.registrar_ip_white?(request.ip)
 
-    # api_ip_whitelisted = true
-    # if current_user.can?(:create, :epp_request)
-    #   api_ip_whitelisted = current_user.registrar.api_ip_white?(request.ip)
-    # end
-
-    return if registrar_ip_whitelisted # && api_ip_whitelisted
+    return if registrar_ip_whitelisted
     flash[:alert] = t('ip_is_not_whitelisted')
     sign_out(current_user)
     redirect_to registrar_login_path and return
   end
-  # rubocop:enable Metrics/PerceivedComplexity
-  # rubocop:enable Metrics/CyclomaticComplexity
 
   helper_method :head_title_sufix
   def head_title_sufix
diff --git a/app/models/ability.rb b/app/models/ability.rb
index bb120dc2f..cf98cb704 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -30,21 +30,16 @@ class Ability
   #
 
   def super # Registrar/api_user dynamic role
-    static_registrar
     epp
     billing
   end
 
   def epp # Registrar/api_user dynamic role
-    # static_registrar
     can :view, :registrar_dashboard
 
     if @user.registrar.api_ip_white?(@ip)
       can :manage, :poll
       can :manage, Depp::Contact
-      # can :manage, Depp::Domain
-      # can :renew,  Depp::Domain
-      # can :transfer, Depp::Domain
       # can :manage, Depp::Keyrelay # TODO: Keyrelay is disabled for now
       # can :confirm, :keyrelay # TODO: Keyrelay is disabled for now
       can :manage, :xml_console
@@ -84,7 +79,6 @@ class Ability
     can(:manage, Invoice) { |i| i.buyer_id == @user.registrar_id }
     can :manage, :deposit
     can :read, AccountActivity
-    #can(:create, :epp_login) # billing can establis epp connection in order to login
   end
 
   def customer_service # Admin/admin_user dynamic role
@@ -122,23 +116,6 @@ class Ability
     can :access, :settings_menu
   end
 
-  #
-  # Static roles, linked from dynamic roles
-  #
-  def static_registrar
-    #can :manage, Nameserver
-    # can :view, :registrar_dashboard
-    # can :delete, :registrar_poll
-    # can :manage, :registrar_xml_console
-    # can :manage, Depp::Contact
-    # can :manage, Depp::Domain
-    # can :renew,  Depp::Domain
-    # can :transfer, Depp::Domain
-    # can :manage, Depp::Keyrelay
-    # can :confirm, :keyrelay
-    # can :confirm, :transfer
-  end
-
   def static_registrant
     can :manage, :registrant_domains
     can :manage, :registrant_whois