diff --git a/lib/fog/aws.rb b/lib/fog/aws.rb
index 3beaf461d..a08911249 100644
--- a/lib/fog/aws.rb
+++ b/lib/fog/aws.rb
@@ -2,121 +2,6 @@ require 'fog/aws/version'
 
 module Fog
   module AWS
-    class << self
-      def class_for(key)
-        case key
-        when :auto_scaling
-          Fog::AWS::AutoScaling
-        when :beanstalk
-          Fog::AWS::ElasticBeanstalk
-        when :cdn
-          Fog::CDN::AWS
-        when :cloud_formation
-          Fog::AWS::CloudFormation
-        when :cloud_watch
-          Fog::AWS::CloudWatch
-        when :compute
-          Fog::Compute::AWS
-        when :data_pipeline
-          Fog::AWS::DataPipeline
-        when :ddb, :dynamodb
-          Fog::AWS::DynamoDB
-        when :dns
-          Fog::DNS::AWS
-        when :elasticache
-          Fog::AWS::Elasticache
-        when :elb
-          Fog::AWS::ELB
-        when :emr
-          Fog::AWS::EMR
-        when :glacier
-          Fog::AWS::Glacier
-        when :iam
-          Fog::AWS::IAM
-        when :redshift
-          Fog::AWS::Redshift
-        when :sdb, :simpledb
-          Fog::AWS::SimpleDB
-        when :ses
-          Fog::AWS::SES
-        when :sqs
-          Fog::AWS::SQS
-        when :eu_storage, :storage
-          Fog::Storage::AWS
-        when :rds
-          Fog::AWS::RDS
-        when :sns
-          Fog::AWS::SNS
-        when :sts
-          Fog::AWS::STS
-        else
-          # @todo Replace most instances of ArgumentError with NotImplementedError
-          # @todo For a list of widely supported Exceptions, see:
-          # => http://www.zenspider.com/Languages/Ruby/QuickRef.html#35
-          raise ArgumentError, "Unsupported #{self} service: #{key}"
-        end
-      end
-
-      def [](service)
-        @@connections ||= Hash.new do |hash, key|
-          hash[key] = case key
-                      when :auto_scaling
-                        Fog::AWS::AutoScaling.new
-                      when :beanstalk
-                        Fog::AWS::ElasticBeanstalk.new
-                      when :cdn
-                        Fog::Logger.warning("Fog::AWS[:cdn] is not recommended, use CDN[:aws] for portability")
-                        Fog::CDN.new(:provider => 'AWS')
-                      when :cloud_formation
-                        Fog::AWS::CloudFormation.new
-                      when :cloud_watch
-                        Fog::AWS::CloudWatch.new
-                      when :compute
-                        Fog::Logger.warning("Fog::AWS[:compute] is not recommended, use Compute[:aws] for portability")
-                        Fog::Compute.new(:provider => 'AWS')
-                      when :data_pipeline
-                        Fog::AWS::DataPipeline
-                      when :ddb, :dynamodb
-                        Fog::AWS::DynamoDB.new
-                      when :dns
-                        Fog::Logger.warning("Fog::AWS[:dns] is not recommended, use DNS[:aws] for portability")
-                        Fog::DNS.new(:provider => 'AWS')
-                      when :elasticache
-                        Fog::AWS::Elasticache.new
-                      when :elb
-                        Fog::AWS::ELB.new
-                      when :emr
-                        Fog::AWS::EMR.new
-                      when :glacier
-                        Fog::AWS::Glacier.new
-                      when :iam
-                        Fog::AWS::IAM.new
-                      when :redshift
-                        Fog::AWS::Redshift.new
-                      when :rds
-                        Fog::AWS::RDS.new
-                      when :eu_storage
-                        Fog::Storage.new(:provider => 'AWS', :region => 'eu-west-1')
-                      when :sdb, :simpledb
-                        Fog::AWS::SimpleDB.new
-                      when :ses
-                        Fog::AWS::SES.new
-                      when :sqs
-                        Fog::AWS::SQS.new
-                      when :storage
-                        Fog::Logger.warning("Fog::AWS[:storage] is not recommended, use Storage[:aws] for portability")
-                        Fog::Storage.new(:provider => 'AWS')
-                      when :sns
-                        Fog::AWS::SNS.new
-                      when :sts
-                        Fog::AWS::STS.new
-                      else
-                        raise ArgumentError, "Unrecognized service: #{key.inspect}"
-                      end
-        end
-        @@connections[service]
-      end
-    end
   end
 end
 
diff --git a/lib/fog/bin/aws.rb b/lib/fog/bin/aws.rb
deleted file mode 100644
index fa45dd82a..000000000
--- a/lib/fog/bin/aws.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-class AWS < Fog::Bin
-  def self.class_for(key)
-    Fog::AWS.class_for(key)
-  end
-
-  def self.[](service)
-    Fog::AWS[service]
-  end
-
-  def self.services
-    Fog::AWS.services
-  end
-end