diff --git a/.htaccess b/.htaccess
index 92656d2c3e..bf898938bb 100644
--- a/.htaccess
+++ b/.htaccess
@@ -2,19 +2,15 @@
 #
 # Restrict access to DotFiles (like .htaccess, .env, .gitignore....)
 <FilesMatch "^\.">
-    Order allow,deny
-    Deny from all
+    Require all denied
 </FilesMatch>
 
 # Restrict access to system files
 <FilesMatch "^(composer.json|composer.lock|artisan|code_of_conduct.md|gulpfile.js|package.json|error_log|phpspec.yml|example.env)">
-    Order allow,deny
-    Deny from all
+    Require all denied
 </FilesMatch>
 
 # Uncomment to restrict access to release text files
 #<FilesMatch "^(LICENSE|README.md|readme.txt|release-notes.txt)">
-#    Order allow,deny
-#    Deny from all
+#    Require all denied
 #</FilesMatch>
-
diff --git a/public/.htaccess b/public/.htaccess
index 3691c6f46f..ee185dc7e2 100644
--- a/public/.htaccess
+++ b/public/.htaccess
@@ -16,23 +16,19 @@
 
 # Restrict access to DotFiles (like .htaccess, .env, .gitignore....)
 <FilesMatch "^\.">
-    Order allow,deny
-    Deny from all
+    Require all denied
 </FilesMatch>
 
 # Restrict access to system files
 <FilesMatch "^(composer.json|composer.lock|artisan|code_of_conduct.md|gulpfile.js|package.json|error_log|phpspec.yml|example.env)">
-    Order allow,deny
-    Deny from all
+    Require all denied
 </FilesMatch>
 
 # Uncomment to restrict access to release text files
 #<FilesMatch "^(LICENSE|README.md|readme.txt|release-notes.txt)">
-#    Order allow,deny
-#    Deny from all
+#    Require all denied
 #</FilesMatch>
 
-
-#custom
-RewriteCond %{HTTP_HOST} ^www\.(.*)$ [NC]
-RewriteRule ^(.*)$ http://%1/$1 [R=301,L]
+# Uncomment to redirect www subdomain to naked domain
+#RewriteCond %{HTTP_HOST} ^www\.(.*)$ [NC]
+#RewriteRule ^(.*)$ http://%1/$1 [R=301,L]