diff --git a/README.md b/README.md
index a39b185..807fcce 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,5 @@
 # FLYERALARM PHP Coding Guideline Validator
 
-
 This repository contains the ruleset for the PHP code we develop at [FLYERALARM](https://flyeralarm.com). 
 It mostly consists of PSR-12 with some custom additions. The rules are enforced with the help of squizlabs/PHP_CodeSniffer
 
@@ -8,13 +7,12 @@ The key words “MUST”, “MUST NOT”, “REQUIRED”, “SHALL”, “SHALL
 “SHOULD NOT”, “RECOMMENDED”, “MAY”, and “OPTIONAL” in this document are to be
 interpreted as described in [RFC 2119](http://www.ietf.org/rfc/rfc2119.txt).
 
+
 ## Custom Rules in addition to PSR-12
 
 * Variable names MUST be in lowerCamelCase
 * Yoda conditions MUST NOT be used
 * Unit tests with @expectedException MUST contain @expectedExceptionMessage annotation
-* Return type annotations (@return) MUST only contain one of scalar type, object (e.g. no "@return string|null") or 
-an array of one these
 * Exceptions messages MUST not contain exclamation marks or full stops
 * Keywords GOTO and EVAL MUST NOT be used
 * Underscores in namespaces MUST NOT be used
@@ -22,6 +20,7 @@ an array of one these
 
 
 ## How-To work within *this* project
+
 To prepare run command:
 ```bash
 make
@@ -48,7 +47,9 @@ test:
 	vendor/bin/phpcs -w -p -s --standard=vendor/flyeralarm/php-code-validator/ruleset.xml src/ tests/
 ```
 
+
 ### Add project specific rules
+
 The recommended way to define custom rules for the own project is to provide a ```phpcs.xml``` in the root of your
 project.
 PHP_CodeSniffer will automatically detect this standard if no other standard was defined (See [PHP_CodeSniffer Advanced Usage](https://github.com/squizlabs/PHP_CodeSniffer/wiki/Advanced-Usage#using-a-default-configuration-file)).
@@ -73,6 +74,7 @@ Once the file ```phpcs.xml``` is created the code can be validated using:
 vendor/bin/phpcs
 ```
 
+
 ### Update to latest stable
 
 ```bash
@@ -81,12 +83,14 @@ composer update flyeralarm/php-code-validator
 
 
 ### Run sniffer
+
 ```bash
 make test
 ```
 
 
 ## Use within PHPStorm
+
 1) Ensure the path to PHP Code Sniffer is configured - [open configuration manual](https://confluence.jetbrains.com/display/PhpStorm/PHP+Code+Sniffer+in+PhpStorm#PHPCodeSnifferinPhpStorm-1.1.SpecifyingthepathtoPHPCodeSniffer) 
 2) Open settings: \
    Mac: `PhpStorm` > `Preferences` > `Editor` > `Inspections` > `PHP` \
@@ -98,4 +102,4 @@ make test
 7) Confirm dialogs by pressing `ok`
 
 
-On a side note: [We are searching for talented people to join our various teams of developers in multiple locations](https://karriere.flyeralarm.com/jobs)
+On a side note: [We are searching for talented people to join our various teams of developers in multiple locations](https://www.flyeralarm.com/it-jobs/)
diff --git a/custom-standards/Flyeralarm/Sniffs/Docblock/ReturnTypeSniff.php b/custom-standards/Flyeralarm/Sniffs/Docblock/ReturnTypeSniff.php
deleted file mode 100644
index 6271637..0000000
--- a/custom-standards/Flyeralarm/Sniffs/Docblock/ReturnTypeSniff.php
+++ /dev/null
@@ -1,148 +0,0 @@
-<?php
-
-namespace Flyeralarm\CodingGuidelines\Flyeralarm\Sniffs\Docblock;
-
-use PHP_CodeSniffer\Sniffs\Sniff;
-use PHP_CodeSniffer\Files\File;
-
-class ReturnTypeSniff implements Sniff
-{
-    /**
-     * @var array
-     */
-    private $returnTypeScalarWhitelist = [
-        'bool',
-        'int',
-        'string',
-        'float',
-        'resource',
-        'array',
-        'bool[]',
-        'int[]',
-        'string[]',
-        'float[]',
-        'null'
-    ];
-
-    /**
-     * @var array
-     */
-    private $returnTypeClassWhitelist = [
-        'mysqli',
-        'mysqli_driver',
-        'mysqli_result',
-        'mysqli_stmt',
-        'mysqli_sql_exception',
-        'mysqli_warning',
-    ];
-
-    /**
-     * @return array
-     */
-    public function register()
-    {
-        return array(T_DOC_COMMENT_OPEN_TAG);
-    }
-
-    /**
-     * @param File $phpcsFile
-     * @param int $stackPtr
-     * @return void
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        if (!$this->hasReturnInDoc($phpcsFile, $stackPtr)) {
-            return;
-        }
-
-        $tokens = $phpcsFile->getTokens();
-        $returnTypePtr = $this->getDocReturnTypePtr($phpcsFile, $stackPtr);
-        $returnTypeString = $tokens[$returnTypePtr]['content'];
-        $returnTypes = explode('|', $returnTypeString);
-
-        foreach ($returnTypes as $returnType) {
-            $returnType = trim($returnType);
-            if (in_array($returnType, $this->returnTypeScalarWhitelist, true)) {
-                continue;
-            }
-            if (in_array($returnType, $this->returnTypeClassWhitelist, true)) {
-                continue;
-            }
-            if ($this->isStartingWithUppercaseLetter($returnType)) {
-                continue;
-            }
-
-            $phpcsFile->addError(
-                sprintf('Return type "%s" is discouraged', $returnType),
-                $returnTypePtr,
-                'ProhibitedReturnType'
-            );
-        }
-    }
-
-    /**
-     * @param File $phpcsFile
-     * @param $stackPtr
-     * @return int
-     */
-    private function getDocReturnTypePtr(File $phpcsFile, $stackPtr)
-    {
-        $commentEndPtr = $phpcsFile->getTokens()[$stackPtr]['comment_closer'];
-        $returnTokenPtr = $this->getNextDocReturnToken($phpcsFile, $stackPtr);
-        $nextString = $phpcsFile->findNext(T_DOC_COMMENT_STRING, $returnTokenPtr + 1, $commentEndPtr);
-
-        return $nextString;
-    }
-
-    /**
-     * @param File $phpcsFile
-     * @param $docStartPtr
-     * @return int
-     */
-    private function getNextDocReturnToken(File $phpcsFile, $docStartPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-        $commentEndPtr = $tokens[$docStartPtr]['comment_closer'];
-        for ($currentTokenIndex = $docStartPtr; $currentTokenIndex < $commentEndPtr; $currentTokenIndex++) {
-            $currentToken = $phpcsFile->findNext(T_DOC_COMMENT_TAG, $currentTokenIndex, $commentEndPtr);
-            if ($tokens[$currentToken]['content'] == '@return') {
-                return $currentToken;
-            }
-        }
-
-        throw new \OutOfBoundsException('Found no @return tag');
-    }
-
-    /**
-     * @param File $phpcsFile
-     * @param int $docStartPtr
-     * @return bool
-     */
-    public function hasReturnInDoc(File $phpcsFile, $docStartPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-        $commentEnd = $tokens[$docStartPtr]['comment_closer'];
-        for ($currentTokenIndex = $docStartPtr; $currentTokenIndex < $commentEnd; $currentTokenIndex++) {
-            $currentToken = $phpcsFile->findNext(T_DOC_COMMENT_TAG, $currentTokenIndex, $commentEnd);
-            if ($tokens[$currentToken]['content'] == '@return') {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * @param string $singleCharacter
-     * @return bool
-     */
-    private function isStartingWithUppercaseLetter($singleCharacter)
-    {
-        $firstChar = substr($singleCharacter, 0, 1);
-        if (strtoupper($firstChar) == $firstChar) {
-            return true;
-        }
-
-        return false;
-    }
-}
diff --git a/ruleset.xml b/ruleset.xml
index a7ceb6c..7dc39b9 100644
--- a/ruleset.xml
+++ b/ruleset.xml
@@ -10,7 +10,6 @@
     <rule ref="./custom-standards/Flyeralarm/Sniffs/File/ForbiddenKeywordsSniff.php"/>
     <rule ref="./custom-standards/Flyeralarm/Sniffs/File/NamespacesSniff.php"/>
     <rule ref="./custom-standards/Flyeralarm/Sniffs/File/NoClassKindSuffixSniff.php"/>
-    <rule ref="./custom-standards/Flyeralarm/Sniffs/Docblock/ReturnTypeSniff.php"/>
     <rule ref="./custom-standards/Flyeralarm/Sniffs/Docblock/ExpectedExceptionMessageSniff.php"/>
     <rule ref="./custom-standards/Flyeralarm/Sniffs/Variable/LowerCamelCaseSniff.php"/>
     <rule ref="./custom-standards/Flyeralarm/Sniffs/ControlStructures/YodaSniff.php"/>
diff --git a/tests/rules/doc/not-allowed/UnknownScalarReturnTypeInDocComment.php b/tests/rules/doc/not-allowed/UnknownScalarReturnTypeInDocComment.php
deleted file mode 100644
index 09ae74a..0000000
--- a/tests/rules/doc/not-allowed/UnknownScalarReturnTypeInDocComment.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-// @expectedError Return type "mixed" is discouraged
-
-class UnknownScalarReturnTypeInDocComment
-{
-    /**
-     * @return int|mixed
-     */
-    public function foo()
-    {
-        return true;
-    }
-}
diff --git a/tests/ruleset.xml b/tests/ruleset.xml
index c5d44a1..1bfa938 100644
--- a/tests/ruleset.xml
+++ b/tests/ruleset.xml
@@ -10,7 +10,6 @@
     <rule ref="./custom-standards/Flyeralarm/Sniffs/File/ForbiddenKeywordsSniff.php"/>
     <rule ref="./custom-standards/Flyeralarm/Sniffs/File/NamespacesSniff.php"/>
     <rule ref="./custom-standards/Flyeralarm/Sniffs/File/NoClassKindSuffixSniff.php"/>
-    <rule ref="./custom-standards/Flyeralarm/Sniffs/Docblock/ReturnTypeSniff.php"/>
     <rule ref="./custom-standards/Flyeralarm/Sniffs/Docblock/ExpectedExceptionMessageSniff.php"/>
     <rule ref="./custom-standards/Flyeralarm/Sniffs/Variable/LowerCamelCaseSniff.php"/>
     <rule ref="./custom-standards/Flyeralarm/Sniffs/ControlStructures/YodaSniff.php"/>