diff --git a/app/logical/sqs_service.rb b/app/logical/sqs_service.rb
index 4a7418dbe..95fc7a154 100644
--- a/app/logical/sqs_service.rb
+++ b/app/logical/sqs_service.rb
@@ -6,7 +6,7 @@ class SqsService
   end
 
   def enabled?
-    Danbooru.config.aws_sqs_enabled? && credentials.set? && url.present?
+    Danbooru.config.aws_credentials.set? && url.present?
   end
 
   def send_message(string, options = {})
@@ -21,17 +21,9 @@ class SqsService
   end
 
 private
-
-  def credentials
-    @credentials ||= Aws::Credentials.new(
-      Danbooru.config.aws_access_key_id,
-      Danbooru.config.aws_secret_access_key
-    )
-  end
-
   def sqs
     @sqs ||= Aws::SQS::Client.new(
-      credentials: credentials,
+      credentials: Danbooru.config.aws_credentials,
       region: Danbooru.config.aws_sqs_region
     )
   end
diff --git a/config/danbooru_default_config.rb b/config/danbooru_default_config.rb
index 3bb16642d..398db3848 100644
--- a/config/danbooru_default_config.rb
+++ b/config/danbooru_default_config.rb
@@ -437,7 +437,7 @@ module Danbooru
 
     def stripe_secret_key
     end
-    
+
     def stripe_publishable_key
     end
 
@@ -541,20 +541,9 @@ module Danbooru
     end
 
     # iqdbs options - see https://github.com/r888888888/iqdbs
-    def iqdbs_auth_key
-    end
-
     def iqdbs_server
     end
 
-    # google api options
-    def google_api_project
-    end
-
-    def google_api_json_key_path
-      "/var/www/danbooru2/shared/config/google-key.json"
-    end
-
     # AWS config options
     def aws_region
       "us-east-1"
@@ -578,25 +567,6 @@ module Danbooru
       # {:smtp_server_name => "smtp server", :user_name => "user name", :ses_smtp_user_name => "smtp user name", :ses_smtp_password => "smtp password"}
     end
 
-    def aws_s3_enabled?
-      false
-    end
-
-    # Used for backing up images to S3. Must be changed to your own S3 bucket.
-    def aws_s3_bucket_name
-      "danbooru"
-    end
-
-    def aws_sqs_enabled?
-      false
-    end
-
-    def aws_sqs_reltagcalc_url
-    end
-
-    def aws_sqs_post_versions_url
-    end
-
     def aws_sqs_region
     end
 
@@ -621,7 +591,7 @@ module Danbooru
     def enable_image_cropping
       true
     end
-    
+
     # Akismet API key. Used for Dmail spam detection. http://akismet.com/signup/
     def rakismet_key
     end
@@ -643,9 +613,6 @@ module Danbooru
     def recommender_server
     end
 
-    def recommender_key
-    end
-
     def redis_url
       "redis://localhost:6379"
     end
diff --git a/test/test_helpers/iqdb_test_helper.rb b/test/test_helpers/iqdb_test_helper.rb
index edd941f6e..1feeffabc 100644
--- a/test/test_helpers/iqdb_test_helper.rb
+++ b/test/test_helpers/iqdb_test_helper.rb
@@ -18,7 +18,6 @@ module IqdbTestHelper
     Post.stubs(:iqdb_sqs_service).returns(service)
     Post.stubs(:iqdb_enabled?).returns(true)
 
-    Danbooru.config.stubs(:iqdbs_auth_key).returns("hunter2")
     Danbooru.config.stubs(:iqdbs_server).returns("http://localhost:3004")
   end