diff --git a/.travis.yml b/.travis.yml
index cd80bf8dc5..6e2282bd71 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,6 +25,7 @@ install:
   - travis_retry yarn install
 
 before_script:
+  - travis_wait yarn run lint
   - travis_wait yarn run build
   - export CHROME_BIN=chromium-browser
   - export DISPLAY=:99.0
diff --git a/package.json b/package.json
index 3de9539912..4ac9db79f9 100644
--- a/package.json
+++ b/package.json
@@ -186,7 +186,6 @@
     "ts-helpers": "1.1.2",
     "ts-node": "3.3.0",
     "tslint": "5.7.0",
-    "tslint-loader": "3.5.3",
     "typedoc": "0.8.0",
     "typescript": "2.5.2",
     "webpack": "3.6.0",
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index 1f573b6dd8..8d0c2a8437 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -58,10 +58,6 @@ const COMPONENTS = [
   CommunityListElementComponent
 ];
 
-const PROVIDERS = [
-
-];
-
 @NgModule({
   imports: [
     ...MODULES
@@ -74,9 +70,6 @@ const PROVIDERS = [
     ...MODULES,
     ...PIPES,
     ...COMPONENTS
-  ],
-  providers: [
-    ...PROVIDERS
   ]
 })
 export class SharedModule {
diff --git a/src/tsconfig.browser.json b/src/tsconfig.browser.json
index c6de43675d..a14de3972a 100644
--- a/src/tsconfig.browser.json
+++ b/src/tsconfig.browser.json
@@ -1,7 +1,6 @@
 {
   "extends": "../tsconfig.json",
   "angularCompilerOptions": {
-    "genDir": ".",
     "entryModule": "./app/browser-app.module#BrowserAppModule"
   }
 }
diff --git a/src/tsconfig.server.json b/src/tsconfig.server.json
index 52cab4e57e..b86ab358f9 100644
--- a/src/tsconfig.server.json
+++ b/src/tsconfig.server.json
@@ -1,7 +1,6 @@
 {
   "extends": "../tsconfig.json",
   "angularCompilerOptions": {
-    "genDir": ".",
     "entryModule": "./app/server-app.module#ServerAppModule"
   }
 }
diff --git a/webpack/webpack.common.js b/webpack/webpack.common.js
index 00590c9f4a..5abfea9e04 100644
--- a/webpack/webpack.common.js
+++ b/webpack/webpack.common.js
@@ -15,11 +15,6 @@ module.exports = {
   },
   module: {
     rules: [{
-        test: /\.ts$/,
-        enforce: 'pre',
-        loader: 'tslint-loader'
-      },
-      {
         test: /\.ts$/,
         loader: '@ngtools/webpack'
       },
diff --git a/yarn.lock b/yarn.lock
index 45e1344a2d..47204afd69 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6521,7 +6521,7 @@ right-align@^0.1.1:
   dependencies:
     align-text "^0.1.1"
 
-rimraf@2, rimraf@^2.2.8, rimraf@^2.4.4, rimraf@^2.5.1, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.1:
+rimraf@2, rimraf@^2.2.8, rimraf@^2.5.1, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.1.tgz#c2338ec643df7a1b7fe5c54fa86f57428a55f33d"
   dependencies:
@@ -7500,16 +7500,6 @@ tslib@^1.7.1:
   version "1.7.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.7.1.tgz#bc8004164691923a79fe8378bbeb3da2017538ec"
 
-tslint-loader@3.5.3:
-  version "3.5.3"
-  resolved "https://registry.yarnpkg.com/tslint-loader/-/tslint-loader-3.5.3.tgz#343f74122d94f356b689457d3f59f64a69ab606f"
-  dependencies:
-    loader-utils "^1.0.2"
-    mkdirp "^0.5.1"
-    object-assign "^4.1.1"
-    rimraf "^2.4.4"
-    semver "^5.3.0"
-
 tslint@5.7.0:
   version "5.7.0"
   resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.7.0.tgz#c25e0d0c92fa1201c2bc30e844e08e682b4f3552"