diff --git a/.gitattributes b/.gitattributes
index a29125a8ec..065a11c71d 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -47,9 +47,6 @@
 *.tmpl text
 *.phtml text
 
-# server config
-.htaccess text
-
 # git config
 .gitattributes text
 .gitignore text
diff --git a/public/app/.htaccess b/public/app/.htaccess
deleted file mode 100644
index 5204b4b3a3..0000000000
--- a/public/app/.htaccess
+++ /dev/null
@@ -1,44 +0,0 @@
-<ifModule mod_rewrite.c>
-
-
-  #######################################################################
-  # GENERAL                                                             #
-  #######################################################################
-
-  # Make apache follow sym links to files
-  Options +FollowSymLinks
-  # If somebody opens a folder, hide all files from the resulting folder list
-  IndexIgnore */*
-
-
-  #######################################################################
-  # REWRITING                                                           #
-  #######################################################################
-
-  # Enable rewriting
-  RewriteEngine On
-
-  # If its not HTTPS
-  RewriteCond %{HTTPS} off
-
-  # Comment out the RewriteCond above, and uncomment the RewriteCond below if you're using a load balancer (e.g. CloudFlare) for SSL
-  # RewriteCond %{HTTP:X-Forwarded-Proto} !https
-
-  # Redirect to the same URL with https://, ignoring all further rules if this one is in effect
-  RewriteRule ^(.*) https://%{HTTP_HOST}/$1 [R,L]
-
-  # If we get to here, it means we are on https://
-  
-  # If the file with the specified name in the browser doesn't exist
-  RewriteCond %{REQUEST_FILENAME} !-f
-
-  # and the directory with the specified name in the browser doesn't exist
-  RewriteCond %{REQUEST_FILENAME} !-d
-
-  # and we are not opening the root already (otherwise we get a redirect loop)
-  RewriteCond %{REQUEST_FILENAME} !\/$
-
-  # Rewrite all requests to the root
-  RewriteRule ^(.*) /
-
-</ifModule>
diff --git a/public/app/app.js b/public/app/app.js
index 88b6d060bd..2e77fe3b4e 100644
--- a/public/app/app.js
+++ b/public/app/app.js
@@ -6,10 +6,6 @@
  */
 // import 'babel-polyfill';
 
-/* eslint-disable import/no-unresolved */
-// Load the manifest.json file and the .htaccess file
-import '!file?name=[name].[ext]!./manifest.json';
-import 'file?name=[name].[ext]!./.htaccess';
 /* eslint-enable import/no-unresolved */
 // Import all the third party stuff
 // import React from 'react';
diff --git a/public/app/favicon.ico b/public/app/favicon.ico
deleted file mode 100644
index a041392a60..0000000000
Binary files a/public/app/favicon.ico and /dev/null differ
diff --git a/public/docs/general/server-configs.md b/public/docs/general/server-configs.md
deleted file mode 100644
index bede372735..0000000000
--- a/public/docs/general/server-configs.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# Server Configurations
-
-## Apache
-
-This boilerplate includes a `.htaccess` file that does two things:
-
-1. Redirect all traffic to HTTPS because ServiceWorker only works for encrypted
-   traffic.
-1. Rewrite all pages (e.g. `yourdomain.com/subpage`) to `yourdomain.com/index.html`
-   to let `react-router` take care of presenting the correct page.
-
-> Note: For performance reasons you should probably adapt it to run as a static
-  `.conf` file (typically under `/etc/apache2/sites-enabled` or similar) so that
-  your server doesn't have to apply its rules dynamically per request)
-
-## Nginx
-
-Also it includes a `.nginx.conf` file that does the same on Nginx server.
diff --git a/public/internals/webpack/webpack.prod.babel.js b/public/internals/webpack/webpack.prod.babel.js
index 95cbc1ac6e..2259647660 100644
--- a/public/internals/webpack/webpack.prod.babel.js
+++ b/public/internals/webpack/webpack.prod.babel.js
@@ -88,10 +88,6 @@ module.exports = require('./webpack.base.babel')({
       relativePaths: false,
       publicPath: '/',
 
-      // No need to cache .htaccess. See http://mxs.is/googmp,
-      // this is applied before any match in `caches` section
-      excludes: ['.htaccess'],
-
       caches: {
         main: [':rest:'],