diff --git a/app/controllers/api/v1/issues_controller.rb b/app/controllers/api/v1/issues_controller.rb
index 788401480..fc38f49a3 100644
--- a/app/controllers/api/v1/issues_controller.rb
+++ b/app/controllers/api/v1/issues_controller.rb
@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 class Api::V1::IssuesController < Api::V1::BaseController
   respond_to :json
 
diff --git a/app/controllers/api/v1/jobs_controller.rb b/app/controllers/api/v1/jobs_controller.rb
index 613e1cda0..7b09b838d 100644
--- a/app/controllers/api/v1/jobs_controller.rb
+++ b/app/controllers/api/v1/jobs_controller.rb
@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 class Api::V1::JobsController < Api::V1::BaseController
   # QUEUES = %w(iso_worker_observer publish_observer rpm_worker_observer)
   # QUEUE_CLASSES = %w(AbfWorker::IsoWorkerObserver AbfWorker::PublishObserver AbfWorker::RpmWorkerObserver)
diff --git a/app/controllers/api/v1/pull_requests_controller.rb b/app/controllers/api/v1/pull_requests_controller.rb
index 63a3e5d1d..61cf91845 100644
--- a/app/controllers/api/v1/pull_requests_controller.rb
+++ b/app/controllers/api/v1/pull_requests_controller.rb
@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 class Api::V1::PullRequestsController < Api::V1::BaseController
   respond_to :json
 
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index a2849ab85..5834c0797 100644
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 class HomeController < ApplicationController
   before_filter :authenticate_user!, :only => [:activity, :issues, :pull_requests]
 
diff --git a/app/controllers/projects/hooks_controller.rb b/app/controllers/projects/hooks_controller.rb
index f1e12555e..7b57e0c1d 100644
--- a/app/controllers/projects/hooks_controller.rb
+++ b/app/controllers/projects/hooks_controller.rb
@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 class Projects::HooksController < Projects::BaseController
   before_filter :authenticate_user!
   load_and_authorize_resource :project
diff --git a/app/helpers/contents_helper.rb b/app/helpers/contents_helper.rb
index 3ac256546..87f9456e3 100644
--- a/app/helpers/contents_helper.rb
+++ b/app/helpers/contents_helper.rb
@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 module ContentsHelper
 
   def build_content_paths(platform, path)
diff --git a/app/helpers/file_store_helper.rb b/app/helpers/file_store_helper.rb
index bb12c287e..573faeea1 100644
--- a/app/helpers/file_store_helper.rb
+++ b/app/helpers/file_store_helper.rb
@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 module FileStoreHelper
 
   def file_store_results_url(sha1, file_name)
diff --git a/app/helpers/paginate_helper.rb b/app/helpers/paginate_helper.rb
index 3397d14b4..0b4c7eddf 100644
--- a/app/helpers/paginate_helper.rb
+++ b/app/helpers/paginate_helper.rb
@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 module PaginateHelper
 
   def paginate_params
diff --git a/app/models/platform_arch_setting.rb b/app/models/platform_arch_setting.rb
index 82b06820a..bed5a0c65 100644
--- a/app/models/platform_arch_setting.rb
+++ b/app/models/platform_arch_setting.rb
@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 class PlatformArchSetting < ActiveRecord::Base
   DEFAULT_TIME_LIVING = 43200   # seconds, 12 hours
   MIN_TIME_LIVING     = 600     # seconds, 10 minutes
diff --git a/app/models/token.rb b/app/models/token.rb
index b41879458..58c6dbf33 100644
--- a/app/models/token.rb
+++ b/app/models/token.rb
@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 class Token < ActiveRecord::Base
   belongs_to :subject, :polymorphic => true, :touch => true
   belongs_to :creator, :class_name => 'User'
diff --git a/config/environments/staging.rb b/config/environments/staging.rb
index 1b56c5299..4b915da80 100644
--- a/config/environments/staging.rb
+++ b/config/environments/staging.rb
@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 Rosa::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
diff --git a/config/puma/production.rb b/config/puma/production.rb
index 38f02c028..29b235ba6 100644
--- a/config/puma/production.rb
+++ b/config/puma/production.rb
@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 base_path  = "/srv/rosa_build"
 pidfile File.join(base_path, 'shared', 'pids', 'unicorn.pid')
 state_path File.join(base_path, 'shared', 'pids', 'puma.state')
diff --git a/lib/modules/models/regeneration_status.rb b/lib/modules/models/regeneration_status.rb
index af22bc9d0..80e12341a 100644
--- a/lib/modules/models/regeneration_status.rb
+++ b/lib/modules/models/regeneration_status.rb
@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 module Modules
   module Models
     module RegenerationStatus
@@ -8,7 +7,7 @@ module Modules
       WAITING_FOR_REGENERATION  = 100
       REGENERATING              = 200
 
-      HUMAN_STATUSES = {  
+      HUMAN_STATUSES = {
         READY                     => :ready,
         WAITING_FOR_REGENERATION  => :waiting_for_regeneration,
         REGENERATING              => :regenerating
diff --git a/lib/modules/models/url_helper.rb b/lib/modules/models/url_helper.rb
index 76057b522..7dac3d65d 100644
--- a/lib/modules/models/url_helper.rb
+++ b/lib/modules/models/url_helper.rb
@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 module Modules::Models::UrlHelper
   def default_url_options
     host ||= EventLog.current_controller.request.host_with_port rescue ::Rosa::Application.config.action_mailer.default_url_options[:host]
diff --git a/lib/modules/models/web_hooks.rb b/lib/modules/models/web_hooks.rb
index 2eaa450b7..1911a30fc 100644
--- a/lib/modules/models/web_hooks.rb
+++ b/lib/modules/models/web_hooks.rb
@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 module Modules::Models::WebHooks
 
   class << self
diff --git a/lib/modules/observers/activity_feed/build_list.rb b/lib/modules/observers/activity_feed/build_list.rb
index 5a4d764cb..af25b3137 100644
--- a/lib/modules/observers/activity_feed/build_list.rb
+++ b/lib/modules/observers/activity_feed/build_list.rb
@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 module Modules::Observers::ActivityFeed::BuildList
   extend ActiveSupport::Concern
 
diff --git a/lib/modules/observers/activity_feed/comment.rb b/lib/modules/observers/activity_feed/comment.rb
index 0327fcb12..db133c37e 100644
--- a/lib/modules/observers/activity_feed/comment.rb
+++ b/lib/modules/observers/activity_feed/comment.rb
@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 module Modules::Observers::ActivityFeed::Comment
   extend ActiveSupport::Concern
 
diff --git a/lib/modules/observers/activity_feed/git.rb b/lib/modules/observers/activity_feed/git.rb
index c2fde9af9..e1967d0b3 100644
--- a/lib/modules/observers/activity_feed/git.rb
+++ b/lib/modules/observers/activity_feed/git.rb
@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 module Modules::Observers::ActivityFeed::Git
 
   def self.create_notifications(record)
diff --git a/lib/modules/observers/activity_feed/issue.rb b/lib/modules/observers/activity_feed/issue.rb
index 031a0f09d..81f72522a 100644
--- a/lib/modules/observers/activity_feed/issue.rb
+++ b/lib/modules/observers/activity_feed/issue.rb
@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 module Modules::Observers::ActivityFeed::Issue
   extend ActiveSupport::Concern
 
diff --git a/lib/modules/observers/activity_feed/user.rb b/lib/modules/observers/activity_feed/user.rb
index 971378b30..45a01a718 100644
--- a/lib/modules/observers/activity_feed/user.rb
+++ b/lib/modules/observers/activity_feed/user.rb
@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 module Modules::Observers::ActivityFeed::User
   extend ActiveSupport::Concern
 
diff --git a/spec/controllers/advisories_controller_spec.rb b/spec/controllers/advisories_controller_spec.rb
index f2006fd93..447a86c37 100644
--- a/spec/controllers/advisories_controller_spec.rb
+++ b/spec/controllers/advisories_controller_spec.rb
@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 require 'spec_helper'
 
 describe AdvisoriesController do
diff --git a/spec/controllers/api/v1/issues_controller_spec.rb b/spec/controllers/api/v1/issues_controller_spec.rb
index f7342a774..aa3466500 100644
--- a/spec/controllers/api/v1/issues_controller_spec.rb
+++ b/spec/controllers/api/v1/issues_controller_spec.rb
@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 require 'spec_helper'
 
 describe Api::V1::IssuesController do
diff --git a/spec/controllers/api/v1/pull_requests_controller.rb b/spec/controllers/api/v1/pull_requests_controller.rb
index e3469a172..4f205ddf0 100644
--- a/spec/controllers/api/v1/pull_requests_controller.rb
+++ b/spec/controllers/api/v1/pull_requests_controller.rb
@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 require 'spec_helper'
 
 def create_pull to_ref, from_ref, owner, project = @project
diff --git a/spec/controllers/platforms/contents_controller_spec.rb b/spec/controllers/platforms/contents_controller_spec.rb
index e5cca7814..ec85dcf19 100644
--- a/spec/controllers/platforms/contents_controller_spec.rb
+++ b/spec/controllers/platforms/contents_controller_spec.rb
@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 require 'spec_helper'
 
 shared_examples_for 'content platform user without show rights for hidden platform' do
@@ -35,7 +34,7 @@ describe Platforms::ContentsController do
 
     @platform = FactoryGirl.create(:platform)
     @personal_platform = FactoryGirl.create(:platform, :platform_type => 'personal')
-    
+
     @user = FactoryGirl.create(:user)
   end
 
diff --git a/spec/controllers/projects/hooks_controller_spec.rb b/spec/controllers/projects/hooks_controller_spec.rb
index 36e299ef5..8f2e36bf6 100644
--- a/spec/controllers/projects/hooks_controller_spec.rb
+++ b/spec/controllers/projects/hooks_controller_spec.rb
@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 require 'spec_helper'
 
 shared_examples_for 'hooks user with project admin rights' do
diff --git a/spec/factories/hook.rb b/spec/factories/hook.rb
index d7fa39637..282083a95 100644
--- a/spec/factories/hook.rb
+++ b/spec/factories/hook.rb
@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 FactoryGirl.define do
   factory :hook do
     name 'web'
diff --git a/spec/factories/label.rb b/spec/factories/label.rb
index b985a2d98..bcd6fd1b4 100644
--- a/spec/factories/label.rb
+++ b/spec/factories/label.rb
@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 FactoryGirl.define do
   factory :label do
     name { FactoryGirl.generate(:string) }
diff --git a/spec/factories/labeling.rb b/spec/factories/labeling.rb
index 51d1f6d70..16b84ea7d 100644
--- a/spec/factories/labeling.rb
+++ b/spec/factories/labeling.rb
@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 FactoryGirl.define do
   factory :labeling do
     association :project, :factory => :project
diff --git a/spec/factories/project_statistic.rb b/spec/factories/project_statistic.rb
index ec381ef09..091ad56cc 100644
--- a/spec/factories/project_statistic.rb
+++ b/spec/factories/project_statistic.rb
@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 FactoryGirl.define do
   factory :project_statistic do
     association :project, :factory => :project
diff --git a/spec/factories/token.rb b/spec/factories/token.rb
index cee8561b5..f00f17189 100644
--- a/spec/factories/token.rb
+++ b/spec/factories/token.rb
@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 FactoryGirl.define do
   factory :token do
     association :creator, :factory => :user
diff --git a/spec/models/build_list/package_spec.rb b/spec/models/build_list/package_spec.rb
index 3ed6e1c8c..fe71fa974 100644
--- a/spec/models/build_list/package_spec.rb
+++ b/spec/models/build_list/package_spec.rb
@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 require 'spec_helper'
 
 describe BuildList::Package do
diff --git a/spec/models/platform_content.rb b/spec/models/platform_content.rb
index 1edb31e8f..b8f7a64d0 100644
--- a/spec/models/platform_content.rb
+++ b/spec/models/platform_content.rb
@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 require 'spec_helper'
 
 describe PlatformContent do
diff --git a/spec/models/token_spec.rb b/spec/models/token_spec.rb
index 8c3092028..9ceaa4107 100644
--- a/spec/models/token_spec.rb
+++ b/spec/models/token_spec.rb
@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 require 'spec_helper'
 
 describe Token do