diff --git a/.rubocop.yml b/.rubocop.yml
index 854224e..217a37f 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -5,6 +5,9 @@ AllCops:
     - 'db/schema.rb'
     - 'bin/*'
     - 'node_modules/**/*'
+    - 'app/jobs/generate_answer_job.rb'  # Exclude until we can refactor
+    - 'app/controllers/concerns/salesforce_gpt_concern.rb'
+    - 'app/controllers/concerns/gpt_concern.rb'
 
 Style/StringLiterals:
   EnforcedStyle: single_quotes
@@ -22,7 +25,11 @@ Metrics/MethodLength:
   Max: 50
 
 Metrics/AbcSize:
-  Max: 30  
+  Max: 40  
 
 Layout/LineLength:
   Max: 200
+
+Lint/MissingSuper:
+  Exclude:
+    - 'app/policies/*.rb'
diff --git a/app/controllers/concerns/salesforce_gpt_concern.rb b/app/controllers/concerns/salesforce_gpt_concern.rb
deleted file mode 100644
index 8440e78..0000000
--- a/app/controllers/concerns/salesforce_gpt_concern.rb
+++ /dev/null
@@ -1,138 +0,0 @@
-# frozen_string_literal: true
-
-require 'net/http'
-require 'httparty'
-
-module SalesforceGptConcern
-  extend ActiveSupport::Concern
-
-  # Helper to make secure prompts
-  def replace_tag_with_random(input_string, tag)
-    random_string = SecureRandom.hex(10)
-    input_string.gsub(tag) { random_string }
-  end
-
-  def get_embedding(input)
-    call_salesforce_connect_gpt_embedding(input)
-  end
-
-  # Define the get_generation method
-  def get_generation(prompt)
-    call_salesforce_connect_gpt_generation(prompt)
-  end
-
-  def call_salesforce_connect_gpt_embedding(input)
-    oauth_token = get_salesforce_connect_oauth_token
-    access_token = oauth_token['access_token']
-    instance_url = oauth_token['instance_url']
-
-    new_endpoint_url = "#{instance_url}/services/data/v58.0/einstein/llm/embeddings"
-    request_body = {
-      prompts: { wrappedListString: [input] },
-      additionalConfig: {
-        applicationName: 'fack'
-      }
-    }
-
-    uri = URI.parse(new_endpoint_url)
-    http = Net::HTTP.new(uri.host, uri.port)
-    http.use_ssl = true if uri.scheme == 'https'
-
-    request = Net::HTTP::Post.new(uri.path)
-    request.body = request_body.to_json
-    request['Authorization'] = "Bearer #{access_token}"
-    request['Content-Type'] = 'application/json'
-
-    response = http.request(request)
-
-    if response.is_a?(Net::HTTPSuccess)
-      response_data = JSON.parse(response.body)
-      return response_data['embeddings'][0]['embedding']
-    else
-      Rails.logger.error("Error calling Salesforce Connect GPT: #{response.body.message}")
-    end
-
-    null
-  end
-
-  def call_salesforce_connect_gpt_generation(prompt)
-    begin
-      oauth_token = get_salesforce_connect_oauth_token
-      access_token = oauth_token['access_token']
-      instance_url = oauth_token['instance_url']
-
-      new_endpoint_url = "#{instance_url}/services/data/v58.0/einstein/llm/prompt/generations"
-      prompt_text_or_id = prompt
-      request_body = {
-        promptTextorId: prompt_text_or_id,
-        provider: 'OpenAI',
-        additionalConfig: {
-          applicationName: 'fack',
-          maxTokens: ENV['EGPT_MAX_TOKENS'] || 3000, # roughly one page worth of an answer
-          model: ENV['EGPT_GEN_MODEL'] || 'gpt-4-32k',
-          temperature: 0.3,
-          numGenerations: 1
-        }
-      }
-
-      response = HTTParty.post(new_endpoint_url, body: request_body.to_json, headers: {
-                                 'Authorization' => "Bearer #{access_token}",
-                                 'Content-Type' => 'application/json'
-                               })
-
-      response_data = JSON.parse(response.body)
-
-      # Decode the HTML entities
-      decoded_text = CGI.unescapeHTML(response_data['generations'][0]['text'])
-
-      return decoded_text
-    rescue StandardError => e
-      Rails.logger.error("Error calling Salesforce Connect GPT: #{e.message}")
-    end
-
-    ''
-  end
-
-  private
-
-  def get_salesforce_connect_oauth_token
-    encoded_client_id = URI.encode_www_form_component(ENV['SALESFORCE_CONNECT_CLIENT_ID'] || '')
-    encoded_client_secret = URI.encode_www_form_component(ENV['SALESFORCE_CONNECT_CLIENT_SECRET'] || '')
-    encoded_username = ENV.fetch('SALESFORCE_CONNECT_USERNAME', nil)
-    encoded_password = ENV.fetch('SALESFORCE_CONNECT_PASSWORD', nil)
-
-    token_request_data = {
-      grant_type: 'password',
-      client_id: encoded_client_id,
-      client_secret: encoded_client_secret,
-      username: encoded_username,
-      password: encoded_password
-    }
-
-    URI.encode_www_form(token_request_data)
-    oauth_url = "#{ENV.fetch('SALESFORCE_CONNECT_ORG_URL', nil)}/services/oauth2/token"
-
-    begin
-      uri = URI.parse(oauth_url)
-      http = Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = true if uri.scheme == 'https'
-
-      request = Net::HTTP::Post.new(uri.path)
-      request.set_form_data(token_request_data)
-      request['Content-Type'] = 'application/x-www-form-urlencoded'
-
-      response = http.request(request)
-
-      if response.is_a?(Net::HTTPSuccess)
-        access_token = JSON.parse(response.body)
-        return access_token
-      else
-        puts "Error calling Salesforce Connect OAuth: #{response.code} - #{response.body}"
-      end
-    rescue StandardError => e
-      puts "Error calling Salesforce Connect OAuth: #{e.message}"
-    end
-
-    nil
-  end
-end
diff --git a/app/jobs/embed_document_job.rb b/app/jobs/embed_document_job.rb
index eb93d9c..61ffb14 100644
--- a/app/jobs/embed_document_job.rb
+++ b/app/jobs/embed_document_job.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class EmbedDocumentJob < ApplicationJob
-  include SalesforceGptConcern # Include the concern here
+  include GptConcern # Include the concern here
 
   queue_as :default