diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f441e556..fe625ef1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -46,27 +46,20 @@ jobs:
           - rails: main
             ruby: jruby-9.4
 
-    env:
-      RAILS_ENV: test
-      RAILS_VERSION: ${{ matrix.rails }}
     steps:
+      - uses: actions/checkout@v4
+
+      - name: Set RAILS_VERSION
+        run: echo "RAILS_VERSION=${{ matrix.rails }}" >> $GITHUB_ENV
+
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
 
-      - uses: actions/checkout@v4
-
-      - name: Install gems
-        run: bundle install
-        env:
-          BUNDLE_GEMFILE: gemfiles/rails-${{ matrix.rails }}.gemfile
-
       - name: Test
         run: bundle exec rake spec
-        env:
-          BUNDLE_GEMFILE: gemfiles/rails-${{ matrix.rails }}.gemfile
 
   rubocop:
     runs-on: ubuntu-latest
diff --git a/.gitignore b/.gitignore
index 66e63452..3ef763b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,28 +1,20 @@
-.DS_Store
-
+.idea/
 .byebug_history
-/.bundle
-/.yardoc
-/doc
+
 Gemfile.lock
-/coverage
 *.gem
-/.release
 
-.idea/
+coverage/
+.yardoc/
+doc/
+docs.zip
+.release/
 
-gemfiles/*.gemfile.lock
-sample-app/Gemfile.lock
-sample-app/log
-sample-app/tmp
-sample-app.zip
-
-test/dummy/db/migrate
-test/dummy/log/
-
-spec/dummy/db/test.db-shm
-spec/dummy/db/test.db-wal
-spec/dummy/db/test.db
-spec/dummy/db/schema.rb
 spec/dummy/log/
 spec/dummy/tmp/
+spec/dummy/storage/
+
+sample-app/Gemfile.lock
+sample-app/log/
+sample-app/tmp/
+sample-app.zip
\ No newline at end of file
diff --git a/.rubocop.yml b/.rubocop.yml
index 21025455..7253302b 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -20,7 +20,6 @@ Metrics/MethodLength:
 
 Naming/FileName:
   Exclude:
-    - 'gemfiles/*.gemfile'
     - 'lib/aws-sdk-rails.rb'
 
 Style/BlockComments:
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
deleted file mode 100644
index e0f95914..00000000
--- a/.rubocop_todo.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-# This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2024-11-16 00:49:51 UTC using RuboCop version 1.68.0.
-# The point is for the user to remove these configuration records
-# one by one as the offenses are removed from the code base.
-# Note that changes in the inspected code, or installation of new
-# versions of RuboCop, may require this file to be generated again.
-
-# Offense count: 3
-# Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
-Metrics/AbcSize:
-  Max: 21
-
-# Offense count: 2
-# Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
-Metrics/MethodLength:
-  Max: 11
-
-# Offense count: 1
-# Configuration parameters: CountComments, CountAsOne.
-Metrics/ModuleLength:
-  Max: 215
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
-# URISchemes: http, https
-Layout/LineLength:
-  Max: 130
diff --git a/Gemfile b/Gemfile
index a12cdff3..69568a57 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,26 +4,27 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'aws-actiondispatch-dynamodb', git: 'https://github.com/aws/aws-actiondispatch-dynamodb-ruby'
-gem 'aws-actionmailbox-ses', git: 'https://github.com/aws/aws-actionmailbox-ses-ruby'
-gem 'aws-actionmailer-ses', git: 'https://github.com/aws/aws-actionmailer-ses-ruby'
-gem 'aws-activejob-sqs', git: 'https://github.com/aws/aws-activejob-sqs-ruby'
-gem 'aws-record-rails', git: 'https://github.com/aws/aws-record-rails'
-
-group :development, :test do
-  gem 'pry'
+gem 'rake', require: false
+
+case ENV.fetch('RAILS_VERSION', nil)
+when '7.1'
+  gem 'rails', '~> 7.1.0'
+when '7.2'
+  gem 'rails', '~> 7.2.0'
+when '8.0'
+  gem 'rails', '~> 8.0.0'
+else
+  gem 'rails', github: 'rails/rails'
 end
 
 group :development do
   gem 'byebug', platforms: :ruby
+  gem 'pry'
   gem 'rubocop'
 end
 
 group :test do
-  gem 'bcrypt'
-  gem 'minitest-spec-rails'
-  gem 'rspec-rails'
-  gem 'webmock'
+  gem 'rspec'
 end
 
 group :docs do
diff --git a/gemfiles/rails-7.1.gemfile b/gemfiles/rails-7.1.gemfile
deleted file mode 100644
index babb65fd..00000000
--- a/gemfiles/rails-7.1.gemfile
+++ /dev/null
@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-eval_gemfile '../Gemfile'
-
-gem 'rails', '~> 7.1.0'
diff --git a/gemfiles/rails-7.2.gemfile b/gemfiles/rails-7.2.gemfile
deleted file mode 100644
index 6866a47a..00000000
--- a/gemfiles/rails-7.2.gemfile
+++ /dev/null
@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-eval_gemfile '../Gemfile'
-
-gem 'rails', '~> 7.2.0'
diff --git a/gemfiles/rails-8.0.gemfile b/gemfiles/rails-8.0.gemfile
deleted file mode 100644
index cd3dbac3..00000000
--- a/gemfiles/rails-8.0.gemfile
+++ /dev/null
@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-eval_gemfile '../Gemfile'
-
-gem 'rails', '~> 8.0.0'
diff --git a/gemfiles/rails-main.gemfile b/gemfiles/rails-main.gemfile
deleted file mode 100644
index 80b01d94..00000000
--- a/gemfiles/rails-main.gemfile
+++ /dev/null
@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-eval_gemfile '../Gemfile'
-
-gem 'rails', github: 'rails/rails'