diff --git a/CHANGELOG b/CHANGELOG
index 4707cf14d..122a1a8cb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,4 @@
+* Remove unused Carrier#setup method [cody]
 * Don't use Array splat in Regex comparisons in Package [cody]
 * Default the Location to use the :alpha2 country code format [cody]
 * Add configurable timeouts from Active Merchant [cody]
diff --git a/lib/active_shipping/shipping/carrier.rb b/lib/active_shipping/shipping/carrier.rb
index ddffd1177..a8f704c39 100755
--- a/lib/active_shipping/shipping/carrier.rb
+++ b/lib/active_shipping/shipping/carrier.rb
@@ -10,21 +10,14 @@ class Carrier
       attr_accessor :test_mode
       alias_method :test_mode?, :test_mode
       
-      # Override 'setup' method instead of 'initialize' in subclasses for most cases.
       # Credentials should be in options hash under keys :login, :password and/or :key.
       def initialize(options = {})
         requirements.each {|key| requires!(options, key)}
         @options = options
         @last_request = nil
         @test_mode = @options[:test]
-        setup
       end
-      
-      # Override to put any initializing code you want in this method; it gets called at the end of initialize.
-      def setup
-        
-      end
-      
+
       # Override to return required keys in options hash for initialize method.
       def requirements
         []