diff --git a/.eslintrc b/.eslintrc
deleted file mode 100644
index 0a49faffc..000000000
--- a/.eslintrc
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "extends": "eslint:recommended",
-    "parserOptions": {
-        "ecmaVersion": "latest",
-        "sourceType": "script"
-    },
-    "rules": {
-        "indent": "off",
-        "linebreak-style": "off",
-        "semi": "off",
-        "no-console": "off",
-        "lines-around-comment": "off",
-        "max-len": "off",
-        "camelcase": "off",
-        "eqeqeq": "off",
-        "dot-notation": "off",
-        "no-useless-escape": "off",
-        "no-undef": "1",
-        "space-in-parens": "off",
-        "quotes": "off",
-        "key-spacing": "off"
-    }
-}
\ No newline at end of file
diff --git a/.eslintrc.js b/.eslintrc.js
new file mode 100644
index 000000000..245b56961
--- /dev/null
+++ b/.eslintrc.js
@@ -0,0 +1,23 @@
+{
+    "extends": "eslint:recommended",
+    "parserOptions": {
+        "ecmaVersion": "latest",
+        "sourceType": "script"
+    },
+    "rules": {
+        "indent": 0,
+        "linebreak-style": 0,
+        "semi": 0,
+        "no-console": 0,
+        "lines-around-comment": 0,
+        "max-len": 0,
+        "camelcase": 0,
+        "eqeqeq": 0,
+        "dot-notation": 0,
+        "no-useless-escape": 0,
+        "no-undef": 0,
+        "space-in-parens": 0,
+        "quotes": 0,
+        "key-spacing": 0
+    }
+}
\ No newline at end of file
diff --git a/lib/router.transfer.js b/lib/router.transfer.js
index 9e9533eac..cea683c6c 100644
--- a/lib/router.transfer.js
+++ b/lib/router.transfer.js
@@ -25,8 +25,6 @@ module.exports = function (app) {
     } else {
       res.redirect(app_config.public_url + "/error.html?success=true");
     }
-
-    return Promise.resolve();
   }
 
   async function requestTransfer(req, res) {
diff --git a/package.json b/package.json
index d9e2a42f9..08e20f779 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
     "jasmine": "nyc jasmine",
     "test": "mkdir coverage; nyc jasmine; nyc report --reporter=text-lcov > coverage/lcov.info; coveralls < coverage/lcov.info",
     "dev": "source ./.env && echo $ENVIRONMENT && nyc jasmine; nyc report --reporter=text-lcov > coverage/lcov.info; coveralls < coverage/lcov.info",
-    "lint": "eslint --config ./.eslintrc --ignore-path ./.eslintignore ./",
+    "lint": "eslint --config ./.eslintrc.js --ignore-path ./.eslintignore ./",
     "coverage": "npm run mocha",
     "mocha": "mocha spec/jasmine --delay=3000 --exit --timeout=5000; nyc report --reporter=text-lcov > lcov.info && cat lcov.info | node node_modules/coveralls/bin/coveralls.js",
     "version": "npm run npm-auto-version",
diff --git a/spec/jasmine-disabled/ZZ-RouterAPIKeySpec.js b/spec/jasmine/ZZ-RouterAPIKeySpec.js
similarity index 100%
rename from spec/jasmine-disabled/ZZ-RouterAPIKeySpec.js
rename to spec/jasmine/ZZ-RouterAPIKeySpec.js