diff --git a/.php_cs.dist b/.php_cs.dist
index 2ca9f64..17f2a9e 100644
--- a/.php_cs.dist
+++ b/.php_cs.dist
@@ -3,12 +3,12 @@
 declare(strict_types=1);
 
 $header = <<<'EOF'
-All rights reserved.
+Copyright © OXID eSales AG. All rights reserved.
 See LICENSE file for license details.
 EOF;
 
 $finder = PhpCsFixer\Finder::create()
-    ->files()
+    ->exclude('Codeception/_support/_generated/')
     ->in(__DIR__ . '/src')
     ->in(__DIR__ . '/tests/');
 
@@ -23,6 +23,7 @@ return PhpCsFixer\Config::create()
             'space' => 'none'
         ],
         'function_typehint_space' => true,
+        'final_class' => true,
         'method_argument_space' => [
             'on_multiline' => 'ensure_fully_multiline',
         ],
diff --git a/.travis.yml b/.travis.yml
index 8dbc582..97a6978 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,6 +25,5 @@ script:
     - cd graphql-module
     - composer test:syntax
     - composer test:lint
-    - composer test:lint-fixer
     - composer test:static
     - composer test:unit
diff --git a/.travis.yml.dist b/.travis.yml.dist
index a978d1c..e481963 100644
--- a/.travis.yml.dist
+++ b/.travis.yml.dist
@@ -24,6 +24,5 @@ before_script:
 script:
     - composer test:syntax
     - composer test:lint
-    - composer test:lint-fixer
     - composer test:static
     - composer test:unit
diff --git a/packages.json b/packages.json
index 106b21b..ccc57fa 100644
--- a/packages.json
+++ b/packages.json
@@ -5,7 +5,7 @@
         "source": {
           "url": "./",
           "type": "git",
-          "reference": "master"
+          "reference": "master-prepare-webinar-OXDEV-3559"
         }
     }
 }
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
deleted file mode 100644
index af7b4a0..0000000
--- a/phpcs.xml.dist
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<ruleset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="PHP_CodeSniffer" xsi:noNamespaceSchemaLocation="phpcs.xsd">
-    <file>src/</file>
-    <file>tests/</file>
-    <arg name="colors"/>
-    <arg name="parallel" value="75"/>
-    <arg name="extensions" value="php"/>
-    <arg value="np"/>
-    <rule ref="PSR12" />
-</ruleset>
diff --git a/phpstan.neon b/phpstan.neon
index 0c493f5..24f58c1 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -1,6 +1,6 @@
 parameters:
+    checkMissingIterableValueType: false
     level: max
-    inferPrivatePropertyTypeFromConstructor: true
-    autoload_files:
+    scanFiles:
         - vendor/oxid-esales/oxideshop-ce/source/oxfunctions.php
         - vendor/oxid-esales/oxideshop-ce/source/overridablefunctions.php