diff --git a/composer.json b/composer.json
index 561957a135ec99f6c4d3dddc05f3d79ea69a2c57..b4c998cd436d6a658816fdc0784d458474c21e35 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,7 @@
             "name": "Olav Morken",
             "email": "olav.morken@uninett.no"
         },
-	{
+        {
             "name": "Jaime Perez",
             "email": "jaime.perez@uninett.no"
         }
@@ -29,8 +29,7 @@
         "php": ">=5.3",
         "simplesamlphp/saml2": "~1.7",
         "robrichards/xmlseclibs": "~1.4.1",
-        "whitehat101/apr1-md5": "~1.0",
-        "squizlabs/php_codesniffer": "^2.5.1"
+        "whitehat101/apr1-md5": "~1.0"
     },
     "require-dev": {
         "ext-pdo_sqlite": "*",
diff --git a/composer.lock b/composer.lock
index ce251c73474d2d02b45bf7ede8402d125968ae8b..027d048bf3f3ce808dbf4caea7fe550d9da48f45 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "d91235f43e589b4afc940dea2f53f6b6",
-    "content-hash": "2bb2aba1e49dd3229dd566235cb61f8b",
+    "hash": "0272796fd8e300099123d61cc2c08e00",
+    "content-hash": "f95619684158a44490820c38fa1049e3",
     "packages": [
         {
             "name": "psr/log",
@@ -135,83 +135,6 @@
             "description": "SAML2 PHP library from SimpleSAMLphp",
             "time": "2016-01-27 14:23:34"
         },
-        {
-            "name": "squizlabs/php_codesniffer",
-            "version": "2.5.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
-                "reference": "6731851d6aaf1d0d6c58feff1065227b7fda3ba8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/6731851d6aaf1d0d6c58feff1065227b7fda3ba8",
-                "reference": "6731851d6aaf1d0d6c58feff1065227b7fda3ba8",
-                "shasum": ""
-            },
-            "require": {
-                "ext-tokenizer": "*",
-                "ext-xmlwriter": "*",
-                "php": ">=5.1.2"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.0"
-            },
-            "bin": [
-                "scripts/phpcs",
-                "scripts/phpcbf"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "CodeSniffer.php",
-                    "CodeSniffer/CLI.php",
-                    "CodeSniffer/Exception.php",
-                    "CodeSniffer/File.php",
-                    "CodeSniffer/Fixer.php",
-                    "CodeSniffer/Report.php",
-                    "CodeSniffer/Reporting.php",
-                    "CodeSniffer/Sniff.php",
-                    "CodeSniffer/Tokens.php",
-                    "CodeSniffer/Reports/",
-                    "CodeSniffer/Tokenizers/",
-                    "CodeSniffer/DocGenerators/",
-                    "CodeSniffer/Standards/AbstractPatternSniff.php",
-                    "CodeSniffer/Standards/AbstractScopeSniff.php",
-                    "CodeSniffer/Standards/AbstractVariableSniff.php",
-                    "CodeSniffer/Standards/IncorrectPatternException.php",
-                    "CodeSniffer/Standards/Generic/Sniffs/",
-                    "CodeSniffer/Standards/MySource/Sniffs/",
-                    "CodeSniffer/Standards/PEAR/Sniffs/",
-                    "CodeSniffer/Standards/PSR1/Sniffs/",
-                    "CodeSniffer/Standards/PSR2/Sniffs/",
-                    "CodeSniffer/Standards/Squiz/Sniffs/",
-                    "CodeSniffer/Standards/Zend/Sniffs/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Greg Sherwood",
-                    "role": "lead"
-                }
-            ],
-            "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
-            "homepage": "http://www.squizlabs.com/php-codesniffer",
-            "keywords": [
-                "phpcs",
-                "standards"
-            ],
-            "time": "2016-01-19 23:39:10"
-        },
         {
             "name": "whitehat101/apr1-md5",
             "version": "v1.0.0",