diff --git a/Rakefile b/Rakefile
index 477b010a..65be4c93 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,4 +1,3 @@
-# encoding: UTF-8
 require 'rubygems'
 begin
   require 'bundler/setup'
diff --git a/features/step_definitions/activerecord_steps.rb b/features/step_definitions/activerecord_steps.rb
index 30549e21..63bc2ccf 100644
--- a/features/step_definitions/activerecord_steps.rb
+++ b/features/step_definitions/activerecord_steps.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 Given /^an activerecord class that uses the '([^\']*)' table$/ do |name|
   @mountee_klass = Class.new(ActiveRecord::Base)
   @mountee_klass.table_name = name
@@ -19,4 +17,4 @@ end
 
 When /^I delete the active record$/ do
   @instance.destroy
-end
\ No newline at end of file
+end
diff --git a/features/step_definitions/caching_steps.rb b/features/step_definitions/caching_steps.rb
index d02380c7..ad567e92 100644
--- a/features/step_definitions/caching_steps.rb
+++ b/features/step_definitions/caching_steps.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 Given /^the file '(.*?)' is cached file at '(.*?)'$/ do |file, cached|
   FileUtils.mkdir_p(File.dirname(file_path(cached)))
   FileUtils.cp(file_path(file), file_path(cached))
@@ -11,4 +9,4 @@ end
 
 When /^I retrieve the cache name '(.*?)' from the cache$/ do |name|
   @uploader.retrieve_from_cache!(name)
-end
\ No newline at end of file
+end
diff --git a/features/step_definitions/datamapper_steps.rb b/features/step_definitions/datamapper_steps.rb
index 9201ade0..bd00a6ce 100644
--- a/features/step_definitions/datamapper_steps.rb
+++ b/features/step_definitions/datamapper_steps.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 Given /^a datamapper class that has a '([^\']*)' column$/ do |column|
   @mountee_klass = Class.new do
     include DataMapper::Resource
diff --git a/features/step_definitions/file_steps.rb b/features/step_definitions/file_steps.rb
index 81a0ecf1..f075cc6c 100644
--- a/features/step_definitions/file_steps.rb
+++ b/features/step_definitions/file_steps.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 ###
 # EXISTENCE
 
diff --git a/features/step_definitions/general_steps.rb b/features/step_definitions/general_steps.rb
index 570c52c6..aa55bb59 100644
--- a/features/step_definitions/general_steps.rb
+++ b/features/step_definitions/general_steps.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 Given /^an uploader class that uses the '(.*?)' storage$/ do |kind|
   @klass = Class.new(CarrierWave::Uploader::Base)
   @klass.storage = kind.to_sym
diff --git a/features/step_definitions/mount_steps.rb b/features/step_definitions/mount_steps.rb
index 128083d8..9c4b2f3c 100644
--- a/features/step_definitions/mount_steps.rb
+++ b/features/step_definitions/mount_steps.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 When /^I assign the file '([^\']*)' to the '([^\']*)' column$/ do |path, column|
   @instance.send("#{column}=", File.open(file_path(path)))
 end
diff --git a/features/step_definitions/store_steps.rb b/features/step_definitions/store_steps.rb
index 024b37a3..f0daa730 100644
--- a/features/step_definitions/store_steps.rb
+++ b/features/step_definitions/store_steps.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 Given /^the file '(.*?)' is stored at '(.*?)'$/ do |file, stored|
   FileUtils.mkdir_p(File.dirname(file_path(stored)))
   FileUtils.cp(file_path(file), file_path(stored))
diff --git a/features/support/activerecord.rb b/features/support/activerecord.rb
index 36213f8a..c0741344 100644
--- a/features/support/activerecord.rb
+++ b/features/support/activerecord.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'carrierwave/mount'
 require File.join(File.dirname(__FILE__), '..', '..', 'spec', 'support', 'activerecord')
 
diff --git a/features/support/env.rb b/features/support/env.rb
index 684db529..2f88fa3a 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 $:.unshift File.expand_path(File.join('..', '..', 'lib'), File.dirname(__FILE__))
 
 require File.join(File.dirname(__FILE__), 'activerecord')
diff --git a/lib/carrierwave.rb b/lib/carrierwave.rb
index b2a86b61..8febf420 100644
--- a/lib/carrierwave.rb
+++ b/lib/carrierwave.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'fileutils'
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/object/try'
diff --git a/lib/carrierwave/compatibility/paperclip.rb b/lib/carrierwave/compatibility/paperclip.rb
index 305564f9..7570bda2 100644
--- a/lib/carrierwave/compatibility/paperclip.rb
+++ b/lib/carrierwave/compatibility/paperclip.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module CarrierWave
   module Compatibility
 
diff --git a/lib/carrierwave/mount.rb b/lib/carrierwave/mount.rb
index e1b056d4..fb3420bb 100644
--- a/lib/carrierwave/mount.rb
+++ b/lib/carrierwave/mount.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module CarrierWave
 
   ##
@@ -182,7 +180,7 @@ module CarrierWave
         def #{column}_identifier
           _mounter(:#{column}).read_identifiers[0]
         end
-        
+
         def store_previous_changes_for_#{column}
           @_previous_changes_for_#{column} = changes[_mounter(:#{column}).serialization_column]
         end
@@ -332,7 +330,7 @@ module CarrierWave
         def #{column}_identifiers
           _mounter(:#{column}).read_identifiers
         end
-        
+
         def store_previous_changes_for_#{column}
           @_previous_changes_for_#{column} = changes[_mounter(:#{column}).serialization_column]
         end
diff --git a/lib/carrierwave/orm/activerecord.rb b/lib/carrierwave/orm/activerecord.rb
index a6353b68..39a44b1c 100644
--- a/lib/carrierwave/orm/activerecord.rb
+++ b/lib/carrierwave/orm/activerecord.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'active_record'
 require 'carrierwave/validations/active_model'
 
diff --git a/lib/carrierwave/processing/magic_mime_types.rb b/lib/carrierwave/processing/magic_mime_types.rb
index bd07381c..8e16ab17 100644
--- a/lib/carrierwave/processing/magic_mime_types.rb
+++ b/lib/carrierwave/processing/magic_mime_types.rb
@@ -1,9 +1,7 @@
-# encoding: utf-8
-
 module CarrierWave
   ##
   # This module simplifies the use of ruby-filemagic gem to intelligently
-  # and correctly guess and set the content-type of a file. If you want 
+  # and correctly guess and set the content-type of a file. If you want
   # to use this, you'll need to require this file:
   #
   #    require 'carrierwave/processing/magic_mime_types'
diff --git a/lib/carrierwave/processing/mini_magick.rb b/lib/carrierwave/processing/mini_magick.rb
index 215ab264..80fe8beb 100644
--- a/lib/carrierwave/processing/mini_magick.rb
+++ b/lib/carrierwave/processing/mini_magick.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module CarrierWave
 
   ##
diff --git a/lib/carrierwave/processing/rmagick.rb b/lib/carrierwave/processing/rmagick.rb
index 30590204..d80531c7 100644
--- a/lib/carrierwave/processing/rmagick.rb
+++ b/lib/carrierwave/processing/rmagick.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module CarrierWave
 
   ##
diff --git a/lib/carrierwave/sanitized_file.rb b/lib/carrierwave/sanitized_file.rb
index c403d2ac..c78398cf 100644
--- a/lib/carrierwave/sanitized_file.rb
+++ b/lib/carrierwave/sanitized_file.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'pathname'
 require 'active_support/core_ext/string/multibyte'
 
diff --git a/lib/carrierwave/storage/abstract.rb b/lib/carrierwave/storage/abstract.rb
index a802f0c7..82a9d38e 100644
--- a/lib/carrierwave/storage/abstract.rb
+++ b/lib/carrierwave/storage/abstract.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module CarrierWave
   module Storage
 
diff --git a/lib/carrierwave/storage/file.rb b/lib/carrierwave/storage/file.rb
index 2c5a56d6..e14b7fc8 100644
--- a/lib/carrierwave/storage/file.rb
+++ b/lib/carrierwave/storage/file.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module CarrierWave
   module Storage
 
diff --git a/lib/carrierwave/storage/fog.rb b/lib/carrierwave/storage/fog.rb
index e0acb1a5..cd5fdd46 100644
--- a/lib/carrierwave/storage/fog.rb
+++ b/lib/carrierwave/storage/fog.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module CarrierWave
   module Storage
 
diff --git a/lib/carrierwave/test/matchers.rb b/lib/carrierwave/test/matchers.rb
index 088c270e..79aa4d69 100644
--- a/lib/carrierwave/test/matchers.rb
+++ b/lib/carrierwave/test/matchers.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module CarrierWave
   module Test
 
@@ -394,4 +392,3 @@ module CarrierWave
     end # Matchers
   end # Test
 end # CarrierWave
-
diff --git a/lib/carrierwave/uploader.rb b/lib/carrierwave/uploader.rb
index f48c2235..68c985ac 100644
--- a/lib/carrierwave/uploader.rb
+++ b/lib/carrierwave/uploader.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require "carrierwave/uploader/configuration"
 require "carrierwave/uploader/callbacks"
 require "carrierwave/uploader/proxy"
diff --git a/lib/carrierwave/uploader/cache.rb b/lib/carrierwave/uploader/cache.rb
index 64f27d2c..4f14f1d0 100644
--- a/lib/carrierwave/uploader/cache.rb
+++ b/lib/carrierwave/uploader/cache.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module CarrierWave
 
   class FormNotMultipart < UploadError
@@ -7,13 +5,13 @@ module CarrierWave
       "You tried to assign a String or a Pathname to an uploader, for security reasons, this is not allowed.\n\n If this is a file upload, please check that your upload form is multipart encoded."
     end
   end
-  
+
   class CacheCounter
     @@counter = 0
 
     def self.increment
       @@counter += 1
-    end  
+    end
   end
 
   ##
@@ -25,8 +23,8 @@ module CarrierWave
   #
   def self.generate_cache_id
     [Time.now.utc.to_i,
-      Process.pid, 
-      '%04d' % (CarrierWave::CacheCounter.increment % 1000), 
+      Process.pid,
+      '%04d' % (CarrierWave::CacheCounter.increment % 1000),
       '%04d' % rand(9999)
     ].map(&:to_s).join('-')
   end
diff --git a/lib/carrierwave/uploader/callbacks.rb b/lib/carrierwave/uploader/callbacks.rb
index 48b5c1b9..24558482 100644
--- a/lib/carrierwave/uploader/callbacks.rb
+++ b/lib/carrierwave/uploader/callbacks.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module CarrierWave
   module Uploader
     module Callbacks
diff --git a/lib/carrierwave/uploader/default_url.rb b/lib/carrierwave/uploader/default_url.rb
index cb3a5154..357755d3 100644
--- a/lib/carrierwave/uploader/default_url.rb
+++ b/lib/carrierwave/uploader/default_url.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module CarrierWave
   module Uploader
     module DefaultUrl
diff --git a/lib/carrierwave/uploader/download.rb b/lib/carrierwave/uploader/download.rb
index 4e9bad18..16a97db7 100644
--- a/lib/carrierwave/uploader/download.rb
+++ b/lib/carrierwave/uploader/download.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'open-uri'
 
 module CarrierWave
diff --git a/lib/carrierwave/uploader/extension_whitelist.rb b/lib/carrierwave/uploader/extension_whitelist.rb
index ef539881..b9af63ac 100644
--- a/lib/carrierwave/uploader/extension_whitelist.rb
+++ b/lib/carrierwave/uploader/extension_whitelist.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module CarrierWave
   module Uploader
     module ExtensionWhitelist
diff --git a/lib/carrierwave/uploader/file_size.rb b/lib/carrierwave/uploader/file_size.rb
index 457d5ee6..bd96c594 100644
--- a/lib/carrierwave/uploader/file_size.rb
+++ b/lib/carrierwave/uploader/file_size.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module CarrierWave
   module Uploader
     module FileSize
diff --git a/lib/carrierwave/uploader/magic_mime_blacklist.rb b/lib/carrierwave/uploader/magic_mime_blacklist.rb
index 6abe6e97..1a2c13b4 100644
--- a/lib/carrierwave/uploader/magic_mime_blacklist.rb
+++ b/lib/carrierwave/uploader/magic_mime_blacklist.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module CarrierWave
   module Uploader
 
diff --git a/lib/carrierwave/uploader/magic_mime_whitelist.rb b/lib/carrierwave/uploader/magic_mime_whitelist.rb
index 762dd778..de053e63 100644
--- a/lib/carrierwave/uploader/magic_mime_whitelist.rb
+++ b/lib/carrierwave/uploader/magic_mime_whitelist.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module CarrierWave
   module Uploader
 
diff --git a/lib/carrierwave/uploader/mountable.rb b/lib/carrierwave/uploader/mountable.rb
index 80d6f226..9dd96168 100644
--- a/lib/carrierwave/uploader/mountable.rb
+++ b/lib/carrierwave/uploader/mountable.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module CarrierWave
   module Uploader
     module Mountable
diff --git a/lib/carrierwave/uploader/processing.rb b/lib/carrierwave/uploader/processing.rb
index 4f81b5da..573f5444 100644
--- a/lib/carrierwave/uploader/processing.rb
+++ b/lib/carrierwave/uploader/processing.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module CarrierWave
   module Uploader
     module Processing
diff --git a/lib/carrierwave/uploader/proxy.rb b/lib/carrierwave/uploader/proxy.rb
index 86999d72..f48834d5 100644
--- a/lib/carrierwave/uploader/proxy.rb
+++ b/lib/carrierwave/uploader/proxy.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module CarrierWave
   module Uploader
     module Proxy
diff --git a/lib/carrierwave/uploader/remove.rb b/lib/carrierwave/uploader/remove.rb
index 54add98a..96b708c2 100644
--- a/lib/carrierwave/uploader/remove.rb
+++ b/lib/carrierwave/uploader/remove.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module CarrierWave
   module Uploader
     module Remove
diff --git a/lib/carrierwave/uploader/serialization.rb b/lib/carrierwave/uploader/serialization.rb
index ac677253..6aa687b9 100644
--- a/lib/carrierwave/uploader/serialization.rb
+++ b/lib/carrierwave/uploader/serialization.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require "json"
 require "active_support/core_ext/hash"
 
diff --git a/lib/carrierwave/uploader/store.rb b/lib/carrierwave/uploader/store.rb
index bd122c5f..af893206 100644
--- a/lib/carrierwave/uploader/store.rb
+++ b/lib/carrierwave/uploader/store.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module CarrierWave
   module Uploader
     module Store
diff --git a/lib/carrierwave/uploader/url.rb b/lib/carrierwave/uploader/url.rb
index 76d974d5..23de61b8 100644
--- a/lib/carrierwave/uploader/url.rb
+++ b/lib/carrierwave/uploader/url.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module CarrierWave
   module Uploader
     module Url
diff --git a/lib/carrierwave/uploader/versions.rb b/lib/carrierwave/uploader/versions.rb
index 3cdbfcb9..1a556480 100644
--- a/lib/carrierwave/uploader/versions.rb
+++ b/lib/carrierwave/uploader/versions.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module CarrierWave
   module Uploader
     module Versions
diff --git a/lib/carrierwave/utilities.rb b/lib/carrierwave/utilities.rb
index 7bf342f6..6790b1a4 100644
--- a/lib/carrierwave/utilities.rb
+++ b/lib/carrierwave/utilities.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'carrierwave/utilities/uri'
 
 module CarrierWave
diff --git a/lib/carrierwave/utilities/uri.rb b/lib/carrierwave/utilities/uri.rb
index a710fa86..5d6fd312 100644
--- a/lib/carrierwave/utilities/uri.rb
+++ b/lib/carrierwave/utilities/uri.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module CarrierWave
   module Utilities
     module Uri
diff --git a/lib/carrierwave/validations/active_model.rb b/lib/carrierwave/validations/active_model.rb
index 33d668f1..74616796 100644
--- a/lib/carrierwave/validations/active_model.rb
+++ b/lib/carrierwave/validations/active_model.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'active_model/validator'
 require 'active_support/concern'
 
diff --git a/lib/generators/templates/uploader.rb b/lib/generators/templates/uploader.rb
index 76262051..153ab565 100644
--- a/lib/generators/templates/uploader.rb
+++ b/lib/generators/templates/uploader.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class <%= class_name %>Uploader < CarrierWave::Uploader::Base
 
   # Include RMagick or MiniMagick support:
diff --git a/spec/compatibility/paperclip_spec.rb b/spec/compatibility/paperclip_spec.rb
index bf57a800..73a7ae1a 100644
--- a/spec/compatibility/paperclip_spec.rb
+++ b/spec/compatibility/paperclip_spec.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'spec_helper'
 
 require 'carrierwave/orm/activerecord'
diff --git a/spec/mount_multiple_spec.rb b/spec/mount_multiple_spec.rb
index f52cc480..4e082a64 100644
--- a/spec/mount_multiple_spec.rb
+++ b/spec/mount_multiple_spec.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'spec_helper'
 
 describe CarrierWave::Mount do
diff --git a/spec/mount_single_spec.rb b/spec/mount_single_spec.rb
index 78dd53c2..65ff11a3 100644
--- a/spec/mount_single_spec.rb
+++ b/spec/mount_single_spec.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'spec_helper'
 
 describe CarrierWave::Mount do
diff --git a/spec/orm/activerecord_spec.rb b/spec/orm/activerecord_spec.rb
index cca20ef0..3e8f0764 100644
--- a/spec/orm/activerecord_spec.rb
+++ b/spec/orm/activerecord_spec.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'spec_helper'
 require 'support/activerecord'
 
diff --git a/spec/processing/magic_mime_types_spec.rb b/spec/processing/magic_mime_types_spec.rb
index fa09d885..17ba502f 100644
--- a/spec/processing/magic_mime_types_spec.rb
+++ b/spec/processing/magic_mime_types_spec.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'spec_helper'
 
 describe CarrierWave::MagicMimeTypes, :filemagic => true do
diff --git a/spec/processing/mini_magick_spec.rb b/spec/processing/mini_magick_spec.rb
index e10129ab..cfb31f61 100644
--- a/spec/processing/mini_magick_spec.rb
+++ b/spec/processing/mini_magick_spec.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'spec_helper'
 
 describe CarrierWave::MiniMagick do
diff --git a/spec/processing/rmagick_spec.rb b/spec/processing/rmagick_spec.rb
index c115c037..dd8f9f1b 100644
--- a/spec/processing/rmagick_spec.rb
+++ b/spec/processing/rmagick_spec.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'spec_helper'
 
 describe CarrierWave::RMagick, :rmagick => true do
diff --git a/spec/sanitized_file_spec.rb b/spec/sanitized_file_spec.rb
index f4e3c70a..c93b6279 100644
--- a/spec/sanitized_file_spec.rb
+++ b/spec/sanitized_file_spec.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'spec_helper'
 
 begin
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 69aaea32..64d3fc1b 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'rubygems'
 require 'bundler/setup'
 
diff --git a/spec/storage/file_spec.rb b/spec/storage/file_spec.rb
index ff15e084..20ed0332 100644
--- a/spec/storage/file_spec.rb
+++ b/spec/storage/file_spec.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'spec_helper'
 require 'support/file_utils_helper'
 require 'tempfile'
diff --git a/spec/storage/fog_spec.rb b/spec/storage/fog_spec.rb
index 468565a7..bc3a7d3e 100644
--- a/spec/storage/fog_spec.rb
+++ b/spec/storage/fog_spec.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'spec_helper'
 require 'fog'
 require 'carrierwave/storage/fog'
diff --git a/spec/uploader/cache_spec.rb b/spec/uploader/cache_spec.rb
index 7ee4f667..1d243985 100644
--- a/spec/uploader/cache_spec.rb
+++ b/spec/uploader/cache_spec.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'spec_helper'
 
 describe CarrierWave::Uploader do
@@ -268,7 +266,7 @@ describe CarrierWave::Uploader do
       expect(@uploader.filename).to be_nil
       expect(@uploader.cache_name).to be_nil
     end
-    
+
     it "should support old format of cache_id (without counter) for backwards compartibility" do
       @uploader.retrieve_from_cache!('1369894322-345-2255/test.jpeg')
       expect(@uploader.url).to eq('/uploads/tmp/1369894322-345-2255/test.jpeg')
@@ -314,19 +312,19 @@ describe CarrierWave::Uploader do
       end
     end
   end
-  
+
   describe '.generate_cache_id' do
     it 'should generate dir name based on UTC time' do
       Timecop.freeze(Time.at(1369896000)) do
         expect(CarrierWave.generate_cache_id).to match(/\A1369896000-\d+-\d+-\d+\Z/)
       end
     end
-    
+
     it 'should generate dir name with a counter substring' do
       @counter = CarrierWave.generate_cache_id.split('-')[2].to_i
       expect(CarrierWave.generate_cache_id.split('-')[2].to_i).to eq(@counter + 1)
     end
-    
+
     it 'should generate dir name with constant length even when counter has big value' do
       @length = CarrierWave.generate_cache_id.length
       allow(CarrierWave::CacheCounter).to receive(:increment).and_return(1234567890)
diff --git a/spec/uploader/callback_spec.rb b/spec/uploader/callback_spec.rb
index 59c4f0b3..1da58485 100644
--- a/spec/uploader/callback_spec.rb
+++ b/spec/uploader/callback_spec.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'spec_helper'
 
 describe CarrierWave::Uploader do
diff --git a/spec/uploader/configuration_spec.rb b/spec/uploader/configuration_spec.rb
index c3e28d76..e0df947d 100644
--- a/spec/uploader/configuration_spec.rb
+++ b/spec/uploader/configuration_spec.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'spec_helper'
 
 
diff --git a/spec/uploader/default_url_spec.rb b/spec/uploader/default_url_spec.rb
index 2e1725e8..7f8321da 100644
--- a/spec/uploader/default_url_spec.rb
+++ b/spec/uploader/default_url_spec.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'spec_helper'
 
 describe CarrierWave::Uploader do
diff --git a/spec/uploader/download_spec.rb b/spec/uploader/download_spec.rb
index d9d0160a..3338599d 100644
--- a/spec/uploader/download_spec.rb
+++ b/spec/uploader/download_spec.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'spec_helper'
 
 describe CarrierWave::Uploader::Download do
diff --git a/spec/uploader/extension_blacklist_spec.rb b/spec/uploader/extension_blacklist_spec.rb
index 875bbeba..c89331e1 100644
--- a/spec/uploader/extension_blacklist_spec.rb
+++ b/spec/uploader/extension_blacklist_spec.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'spec_helper'
 
 describe CarrierWave::Uploader do
diff --git a/spec/uploader/extension_whitelist_spec.rb b/spec/uploader/extension_whitelist_spec.rb
index c8983aeb..17e546e6 100644
--- a/spec/uploader/extension_whitelist_spec.rb
+++ b/spec/uploader/extension_whitelist_spec.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'spec_helper'
 
 describe CarrierWave::Uploader do
diff --git a/spec/uploader/file_size_spec.rb b/spec/uploader/file_size_spec.rb
index f2667b94..77f7f1a3 100644
--- a/spec/uploader/file_size_spec.rb
+++ b/spec/uploader/file_size_spec.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'spec_helper'
 
 describe CarrierWave::Uploader do
diff --git a/spec/uploader/magic_mime_blacklist_spec.rb b/spec/uploader/magic_mime_blacklist_spec.rb
index 7db059e0..bfb443e3 100644
--- a/spec/uploader/magic_mime_blacklist_spec.rb
+++ b/spec/uploader/magic_mime_blacklist_spec.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'spec_helper'
 
 describe CarrierWave::Uploader, filemagic: true do
diff --git a/spec/uploader/magic_mime_whitelist_spec.rb b/spec/uploader/magic_mime_whitelist_spec.rb
index db205b65..3fa76448 100644
--- a/spec/uploader/magic_mime_whitelist_spec.rb
+++ b/spec/uploader/magic_mime_whitelist_spec.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'spec_helper'
 
 describe CarrierWave::Uploader, filemagic: true do
diff --git a/spec/uploader/mountable_spec.rb b/spec/uploader/mountable_spec.rb
index 8a913ddd..f1fc2150 100644
--- a/spec/uploader/mountable_spec.rb
+++ b/spec/uploader/mountable_spec.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'spec_helper'
 
 describe CarrierWave::Uploader do
diff --git a/spec/uploader/overrides_spec.rb b/spec/uploader/overrides_spec.rb
index 3f22a7ec..01fcac7f 100644
--- a/spec/uploader/overrides_spec.rb
+++ b/spec/uploader/overrides_spec.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'spec_helper'
 
 describe CarrierWave::Uploader do
@@ -66,4 +64,4 @@ describe CarrierWave::Uploader do
       expect(@uploader_overridden.fog_public).to be_eql(false)
     end
   end
-end
\ No newline at end of file
+end
diff --git a/spec/uploader/paths_spec.rb b/spec/uploader/paths_spec.rb
index c3572a26..d4ac415f 100644
--- a/spec/uploader/paths_spec.rb
+++ b/spec/uploader/paths_spec.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'spec_helper'
 
 describe CarrierWave::Uploader do
diff --git a/spec/uploader/processing_spec.rb b/spec/uploader/processing_spec.rb
index fa3bd00e..cc653008 100644
--- a/spec/uploader/processing_spec.rb
+++ b/spec/uploader/processing_spec.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'spec_helper'
 
 describe CarrierWave::Uploader do
diff --git a/spec/uploader/proxy_spec.rb b/spec/uploader/proxy_spec.rb
index a68a8897..744bf006 100644
--- a/spec/uploader/proxy_spec.rb
+++ b/spec/uploader/proxy_spec.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'spec_helper'
 
 describe CarrierWave::Uploader do
diff --git a/spec/uploader/remove_spec.rb b/spec/uploader/remove_spec.rb
index 0bf02b70..a3519d0a 100644
--- a/spec/uploader/remove_spec.rb
+++ b/spec/uploader/remove_spec.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'spec_helper'
 
 describe CarrierWave::Uploader do
diff --git a/spec/uploader/store_spec.rb b/spec/uploader/store_spec.rb
index 8bfa013e..ca23f63e 100644
--- a/spec/uploader/store_spec.rb
+++ b/spec/uploader/store_spec.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'spec_helper'
 
 describe CarrierWave::Uploader do
diff --git a/spec/uploader/url_spec.rb b/spec/uploader/url_spec.rb
index 81c2c2bd..b701b65c 100644
--- a/spec/uploader/url_spec.rb
+++ b/spec/uploader/url_spec.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'spec_helper'
 require 'active_support/json'
 
diff --git a/spec/uploader/versions_spec.rb b/spec/uploader/versions_spec.rb
index aafcba05..5fd4be3b 100644
--- a/spec/uploader/versions_spec.rb
+++ b/spec/uploader/versions_spec.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'spec_helper'
 
 describe CarrierWave::Uploader do