diff --git a/app/controllers/getting_started_controller.rb b/app/controllers/getting_started_controller.rb
index a38be1db8..4147f56df 100644
--- a/app/controllers/getting_started_controller.rb
+++ b/app/controllers/getting_started_controller.rb
@@ -673,7 +673,7 @@ curl http://localhost/api/v1/getting_started -v -u #{login}:#{password}
           message: e.to_s,
           subject: subject,
         }
-        return # rubocop:disable Lint/NonLocalExitFromIterator
+        return
       end
 
       next if !found
@@ -735,7 +735,7 @@ curl http://localhost/api/v1/getting_started -v -u #{login}:#{password}
       render json: {
         result: 'ok',
       }
-      return # rubocop:disable Lint/NonLocalExitFromIterator
+      return
     }
 
     # check delivery for 30 sek.
diff --git a/app/models/application_model/activity_stream_base.rb b/app/models/application_model/activity_stream_base.rb
index 7e7d42c7d..e4233237b 100644
--- a/app/models/application_model/activity_stream_base.rb
+++ b/app/models/application_model/activity_stream_base.rb
@@ -1,5 +1,4 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
-# rubocop:disable ClassAndModuleChildren
 module ApplicationModel::ActivityStreamBase
 
 =begin
diff --git a/app/models/application_model/assets.rb b/app/models/application_model/assets.rb
index 9250740da..1080db158 100644
--- a/app/models/application_model/assets.rb
+++ b/app/models/application_model/assets.rb
@@ -1,5 +1,4 @@
 #36 Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
-# rubocop:disable ClassAndModuleChildren
 module ApplicationModel::Assets
 
 =begin
diff --git a/app/models/application_model/background_job_search_index.rb b/app/models/application_model/background_job_search_index.rb
index bae7e1716..4d71aace3 100644
--- a/app/models/application_model/background_job_search_index.rb
+++ b/app/models/application_model/background_job_search_index.rb
@@ -1,5 +1,4 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
-# rubocop:disable ClassAndModuleChildren
 class ApplicationModel::BackgroundJobSearchIndex
   def initialize(object, o_id)
     @object = object
diff --git a/app/models/application_model/history_log_base.rb b/app/models/application_model/history_log_base.rb
index f75166e1d..518b8318a 100644
--- a/app/models/application_model/history_log_base.rb
+++ b/app/models/application_model/history_log_base.rb
@@ -1,5 +1,4 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
-# rubocop:disable ClassAndModuleChildren
 module ApplicationModel::HistoryLogBase
 
 =begin
diff --git a/app/models/application_model/search_index_base.rb b/app/models/application_model/search_index_base.rb
index 326f713c7..863b9e481 100644
--- a/app/models/application_model/search_index_base.rb
+++ b/app/models/application_model/search_index_base.rb
@@ -1,5 +1,4 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
-# rubocop:disable ClassAndModuleChildren
 module ApplicationModel::SearchIndexBase
 
 =begin
diff --git a/app/models/store/provider/file.rb b/app/models/store/provider/file.rb
index 69ed9c9af..c83080a67 100644
--- a/app/models/store/provider/file.rb
+++ b/app/models/store/provider/file.rb
@@ -1,6 +1,4 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
-# rubocop:disable ClassAndModuleChildren
-
 class Store::Provider::File
 
   # write file to fs
diff --git a/app/models/ticket/activity_stream_log.rb b/app/models/ticket/activity_stream_log.rb
index 1533d6479..47c924d67 100644
--- a/app/models/ticket/activity_stream_log.rb
+++ b/app/models/ticket/activity_stream_log.rb
@@ -1,5 +1,4 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
-# rubocop:disable ClassAndModuleChildren
 module Ticket::ActivityStreamLog
 
 =begin
diff --git a/app/models/ticket/article.rb b/app/models/ticket/article.rb
index 3869a3177..4f1806977 100644
--- a/app/models/ticket/article.rb
+++ b/app/models/ticket/article.rb
@@ -1,5 +1,4 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
-# rubocop:disable ClassAndModuleChildren
 class Ticket::Article < ApplicationModel
   load 'ticket/article/assets.rb'
   include Ticket::Article::Assets
diff --git a/app/models/ticket/article/activity_stream_log.rb b/app/models/ticket/article/activity_stream_log.rb
index a3a7809b8..07365d6c7 100644
--- a/app/models/ticket/article/activity_stream_log.rb
+++ b/app/models/ticket/article/activity_stream_log.rb
@@ -1,5 +1,4 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
-# rubocop:disable ClassAndModuleChildren
 module Ticket::Article::ActivityStreamLog
 
 =begin
diff --git a/app/models/ticket/assets.rb b/app/models/ticket/assets.rb
index a2fe4feef..5a75f2117 100644
--- a/app/models/ticket/assets.rb
+++ b/app/models/ticket/assets.rb
@@ -1,5 +1,4 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
-# rubocop:disable ClassAndModuleChildren
 module Ticket::Assets
 
 =begin
diff --git a/app/models/ticket/counter.rb b/app/models/ticket/counter.rb
index d5210297d..ec0aa1d13 100644
--- a/app/models/ticket/counter.rb
+++ b/app/models/ticket/counter.rb
@@ -1,4 +1,3 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
-# rubocop:disable ClassAndModuleChildren
 class Ticket::Counter < ApplicationModel
 end
diff --git a/app/models/ticket/escalation.rb b/app/models/ticket/escalation.rb
index 66508ad2a..371d1625f 100644
--- a/app/models/ticket/escalation.rb
+++ b/app/models/ticket/escalation.rb
@@ -1,5 +1,4 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
-# rubocop:disable ClassAndModuleChildren
 module Ticket::Escalation
 
 =begin
diff --git a/app/models/ticket/history_log.rb b/app/models/ticket/history_log.rb
index b9157ef8b..7410b0a14 100644
--- a/app/models/ticket/history_log.rb
+++ b/app/models/ticket/history_log.rb
@@ -1,5 +1,4 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
-# rubocop:disable ClassAndModuleChildren
 module Ticket::HistoryLog
 
 =begin
diff --git a/app/models/ticket/number/date.rb b/app/models/ticket/number/date.rb
index d86dfa83d..42f0ef8c3 100644
--- a/app/models/ticket/number/date.rb
+++ b/app/models/ticket/number/date.rb
@@ -1,5 +1,4 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
-# rubocop:disable ClassAndModuleChildren
 module Ticket::Number::Date
   module_function
 
diff --git a/app/models/ticket/overviews.rb b/app/models/ticket/overviews.rb
index 0e019258a..de346ddc6 100644
--- a/app/models/ticket/overviews.rb
+++ b/app/models/ticket/overviews.rb
@@ -1,5 +1,4 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
-# rubocop:disable ClassAndModuleChildren
 module Ticket::Overviews
 
 =begin
diff --git a/app/models/ticket/permission.rb b/app/models/ticket/permission.rb
index 1e27ea837..4d4ba9b0e 100644
--- a/app/models/ticket/permission.rb
+++ b/app/models/ticket/permission.rb
@@ -1,5 +1,4 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
-# rubocop:disable ClassAndModuleChildren
 module Ticket::Permission
 
 =begin
diff --git a/app/models/ticket/priority.rb b/app/models/ticket/priority.rb
index 652c70089..dd829a162 100644
--- a/app/models/ticket/priority.rb
+++ b/app/models/ticket/priority.rb
@@ -1,5 +1,4 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
-# rubocop:disable ClassAndModuleChildren
 class Ticket::Priority < ApplicationModel
   self.table_name = 'ticket_priorities'
   validates     :name, presence: true
diff --git a/app/models/ticket/screen_options.rb b/app/models/ticket/screen_options.rb
index 6ff37e375..adf41074e 100644
--- a/app/models/ticket/screen_options.rb
+++ b/app/models/ticket/screen_options.rb
@@ -1,5 +1,4 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
-# rubocop:disable ClassAndModuleChildren
 module Ticket::ScreenOptions
 
 =begin
diff --git a/app/models/ticket/search.rb b/app/models/ticket/search.rb
index db14243ac..0a00baa50 100644
--- a/app/models/ticket/search.rb
+++ b/app/models/ticket/search.rb
@@ -1,5 +1,4 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
-# rubocop:disable ClassAndModuleChildren
 module Ticket::Search
 
 =begin
diff --git a/app/models/ticket/search_index.rb b/app/models/ticket/search_index.rb
index 1a6bda4fb..75fc76b64 100644
--- a/app/models/ticket/search_index.rb
+++ b/app/models/ticket/search_index.rb
@@ -1,5 +1,4 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
-# rubocop:disable ClassAndModuleChildren
 module Ticket::SearchIndex
 
 =begin
diff --git a/app/models/ticket/state.rb b/app/models/ticket/state.rb
index 99185a45b..a95eed6d0 100644
--- a/app/models/ticket/state.rb
+++ b/app/models/ticket/state.rb
@@ -1,7 +1,6 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
-# rubocop:disable ClassAndModuleChildren
 class Ticket::State < ApplicationModel
-  belongs_to    :state_type,        class_name: 'Ticket::StateType'
+  belongs_to    :state_type, class_name: 'Ticket::StateType'
   validates     :name, presence: true
 
   latest_change_support
diff --git a/app/models/ticket/state_type.rb b/app/models/ticket/state_type.rb
index a48b46082..6df994e30 100644
--- a/app/models/ticket/state_type.rb
+++ b/app/models/ticket/state_type.rb
@@ -1,7 +1,6 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
-# rubocop:disable ClassAndModuleChildren
 class Ticket::StateType < ApplicationModel
-  has_many      :states,            class_name: 'Ticket::State'
+  has_many      :states, class_name: 'Ticket::State'
   validates     :name, presence: true
   latest_change_support
 end
diff --git a/app/models/ticket/subject.rb b/app/models/ticket/subject.rb
index 18dbc327d..4c946891a 100644
--- a/app/models/ticket/subject.rb
+++ b/app/models/ticket/subject.rb
@@ -1,5 +1,4 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
-# rubocop:disable ClassAndModuleChildren
 module Ticket::Subject
 
 =begin
diff --git a/test/integration/elasticsearch_test.rb b/test/integration/elasticsearch_test.rb
index ed2385a85..770ecf07e 100644
--- a/test/integration/elasticsearch_test.rb
+++ b/test/integration/elasticsearch_test.rb
@@ -1,5 +1,4 @@
 # encoding: utf-8
-# rubocop:disable UselessAssignment
 require 'integration_test_helper'
 
 class ElasticsearchTest < ActiveSupport::TestCase
diff --git a/test/integration/twitter_test.rb b/test/integration/twitter_test.rb
index 4e82d674c..9fbb24f9a 100644
--- a/test/integration/twitter_test.rb
+++ b/test/integration/twitter_test.rb
@@ -1,5 +1,4 @@
 # encoding: utf-8
-# rubocop:disable UselessAssignment
 require 'integration_test_helper'
 
 class TwitterTest < ActiveSupport::TestCase
diff --git a/test/integration_test_helper.rb b/test/integration_test_helper.rb
index e124cab15..5c596be20 100644
--- a/test/integration_test_helper.rb
+++ b/test/integration_test_helper.rb
@@ -1,5 +1,4 @@
 ENV['RAILS_ENV'] = 'test'
-# rubocop:disable ClassAndModuleChildren
 require File.expand_path('../../config/environment', __FILE__)
 require 'rails/test_help'
 require 'cache'
diff --git a/test/test_helper.rb b/test/test_helper.rb
index d170f3842..c490c6b4b 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,5 +1,4 @@
 ENV['RAILS_ENV'] = 'test'
-# rubocop:disable ClassAndModuleChildren
 require File.expand_path('../../config/environment', __FILE__)
 require 'rails/test_help'
 require 'cache'
diff --git a/test/unit/history_test.rb b/test/unit/history_test.rb
index 777b7875b..6a71bdb97 100644
--- a/test/unit/history_test.rb
+++ b/test/unit/history_test.rb
@@ -1,5 +1,4 @@
 # encoding: utf-8
-# rubocop:disable PerceivedComplexity, CyclomaticComplexity
 require 'test_helper'
 
 class HistoryTest < ActiveSupport::TestCase
diff --git a/test/unit/rest_test.rb b/test/unit/rest_test.rb
index 37ef2ceeb..4bc121fdd 100644
--- a/test/unit/rest_test.rb
+++ b/test/unit/rest_test.rb
@@ -1,5 +1,4 @@
 # encoding: utf-8
-# rubocop:disable UselessAssignment
 require 'test_helper'
 
 class RestTest < ActiveSupport::TestCase
diff --git a/test/unit/session_basic_test.rb b/test/unit/session_basic_test.rb
index 02e53a465..1b4551482 100644
--- a/test/unit/session_basic_test.rb
+++ b/test/unit/session_basic_test.rb
@@ -1,5 +1,4 @@
 # encoding: utf-8
-# rubocop:disable UselessAssignment
 require 'test_helper'
 
 class SessionBasicTest < ActiveSupport::TestCase
diff --git a/test/unit/session_basic_ticket_test.rb b/test/unit/session_basic_ticket_test.rb
index 2899a8403..29867dc6b 100644
--- a/test/unit/session_basic_ticket_test.rb
+++ b/test/unit/session_basic_ticket_test.rb
@@ -1,5 +1,4 @@
 # encoding: utf-8
-# rubocop:disable UselessAssignment
 require 'test_helper'
 
 class SessionBasicTicketTest < ActiveSupport::TestCase