diff --git a/CHANGELOG.md b/CHANGELOG.md
index 02e856b3..6990fd72 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 master
 ===
 
+* Removed "Implied Extension feature"
 * Remove 'upgrade' and 'install' CLI commands.
 * Gemfile may be in a parent directory of your Middleman project root (where 'config.rb' is).
 * All dependencies for your Middleman project must be expressed in `Gemfile` - Bundler is no longer optional.
diff --git a/middleman-core/features/front-matter-neighbor.feature b/middleman-core/features/front-matter-neighbor.feature
index b420cba0..f29c554e 100644
--- a/middleman-core/features/front-matter-neighbor.feature
+++ b/middleman-core/features/front-matter-neighbor.feature
@@ -2,11 +2,6 @@ Feature: Neighboring YAML Front Matter
 
   Scenario: Rendering html (yaml)
     Given the Server is running at "frontmatter-neighbor-app"
-    When I go to "/front-matter-auto.html"
-    Then I should see "<h1>This is the title</h1>"
-    Then I should not see "---"
-    When I go to "/front-matter-auto.erb.frontmatter"
-    Then I should see "File Not Found"
     When I go to "/front-matter-2.php"
     Then I should see "<h1>This is the title</h1>"
     Then I should see "<?php"
@@ -38,14 +33,6 @@ Feature: Neighboring YAML Front Matter
     
   Scenario: Rendering html (json)
     Given the Server is running at "frontmatter-neighbor-app"
-    When I go to "/json-front-matter-auto.html"
-    Then I should see "<h1>This is the title</h1>"
-    Then I should not see ";;;"
-    When I go to "/json-front-matter-auto.erb.frontmatter"
-    Then I should see "File Not Found"
-    When I go to "/json-front-matter.html"
-    Then I should see "<h1>This is the title</h1>"
-    Then I should not see ";;;"
     When I go to "/json-front-matter.html.erb.frontmatter"
     Then I should see "File Not Found"
     When I go to "/json-front-matter-2.php"
diff --git a/middleman-core/features/front-matter.feature b/middleman-core/features/front-matter.feature
index a0440f55..1775bc36 100644
--- a/middleman-core/features/front-matter.feature
+++ b/middleman-core/features/front-matter.feature
@@ -3,9 +3,6 @@ Feature: YAML Front Matter
 
   Scenario: Rendering html (yaml)
     Given the Server is running at "frontmatter-app"
-    When I go to "/front-matter-auto.html"
-    Then I should see "<h1>This is the title</h1>"
-    Then I should not see "---"
     When I go to "/front-matter-2.php"
     Then I should see "<h1>This is the title</h1>"
     Then I should see "<?php"
@@ -35,9 +32,6 @@ Feature: YAML Front Matter
     
   Scenario: Rendering html (json)
     Given the Server is running at "frontmatter-app"
-    When I go to "/json-front-matter-auto.html"
-    Then I should see "<h1>This is the title</h1>"
-    Then I should not see ";;;"
     When I go to "/json-front-matter.html"
     Then I should see "<h1>This is the title</h1>"
     Then I should not see ";;;"
diff --git a/middleman-core/features/implied_extensions.feature b/middleman-core/features/implied_extensions.feature
deleted file mode 100644
index 63d4e5c4..00000000
--- a/middleman-core/features/implied_extensions.feature
+++ /dev/null
@@ -1,69 +0,0 @@
-Feature: Use default extensions when user doesn't supply them
-
-  Scenario: Default extensions preview
-    Given the Server is running at "implied-extensions-app"
-    When I go to "/"
-    Then I should see "hello: world"
-    When I go to "/index.html"
-    Then I should see "hello: world"
-    When I go to "/index.erb"
-    Then I should see "File Not Found"
-    When I go to "/index"
-    Then I should see "File Not Found"
-    
-  Scenario: Override erb extension
-    Given a fixture app "implied-extensions-app"
-    And a file named "config.rb" with:
-       """
-       template_extensions :erb => :htm
-       """
-    And the Server is running
-    When I go to "/"
-    Then I should see "File Not Found"
-    When I go to "/index.htm"
-    Then I should see "hello: world"
-    When I go to "/index.erb"
-    Then I should see "File Not Found"
-    When I go to "/index"
-    Then I should see "File Not Found"
-    When I go to "/index.html"
-    Then I should see "File Not Found"
-    
-  Scenario: Override erb extension
-    Given a fixture app "implied-extensions-app"
-    And a file named "config.rb" with:
-       """
-       set :index_file, "index.htm"
-       template_extensions :erb => :htm
-       """
-    And the Server is running
-    When I go to "/"
-    Then I should see "hello: world"
-    When I go to "/index.htm"
-    Then I should see "hello: world"
-  
-  Scenario: Default extensions build
-    Given a fixture app "implied-extensions-app"
-    And a successfully built app at "implied-extensions-app"
-    When I cd to "build"
-    Then the following files should exist:
-      | index.html  |
-    Then the following files should not exist:
-      | index       |
-      | index.erb   |
-    And the file "index.html" should contain "hello: world"
-  
-  Scenario: Default extensions build with override
-    Given a fixture app "implied-extensions-app"
-    And a file named "config.rb" with:
-      """
-      template_extensions :erb => :htm
-      """
-    And a successfully built app at "implied-extensions-app"
-    When I cd to "build"
-    Then the following files should exist:
-      | index.htm   |
-    Then the following files should not exist:
-      | index       |
-      | index.erb   |
-      | index.html  |
\ No newline at end of file
diff --git a/middleman-core/features/more-implied_extensions.feature b/middleman-core/features/more-implied_extensions.feature
deleted file mode 100644
index 31567443..00000000
--- a/middleman-core/features/more-implied_extensions.feature
+++ /dev/null
@@ -1,50 +0,0 @@
-Feature: More default extensions
-
-  Scenario: Default extensions preview
-    Given the Server is running at "more-implied-extensions-app"
-    When I go to "/test.html"
-    Then I should see "Hello"
-    When I go to "/test2.html"
-    Then I should see "World"
-    When I go to "/test3.html"
-    Then I should see "Howdy"
-    When I go to "/test4.html"
-    Then I should see "HELLO"
-    When I go to "/javascripts/app.js"
-    Then I should see "derp"
-    Then I should not see "I am in the layout"
-    When I go to "/stylesheets/style.css"
-    Then I should see "section"
-    Then I should not see "I am in the layout"
-    When I go to "/stylesheets/style2.css"
-    Then I should see "section"
-    Then I should not see "I am in the layout"
-    When I go to "/stylesheets/style3.css"
-    Then I should see "color"
-    Then I should not see "I am in the layout"
-  
-  Scenario: Default extensions build
-    Given a fixture app "more-implied-extensions-app"
-    And a successfully built app at "more-implied-extensions-app"
-    When I cd to "build"
-    Then the following files should exist:
-      | test.html              |
-      | test2.html             |
-      | test3.html             |
-      | test4.html             |
-      | javascripts/app.js     |
-      | stylesheets/style.css  |
-      | stylesheets/style2.css |
-      | stylesheets/style3.css |
-    And the file "test.html" should contain "Hello"
-    And the file "test2.html" should contain "World"
-    And the file "test3.html" should contain "Howdy"
-    And the file "test4.html" should contain "HELLO"
-    And the file "javascripts/app.js" should contain "derp"
-    And the file "javascripts/app.js" should not contain "I am in the layout"
-    And the file "stylesheets/style.css" should contain "section"
-    And the file "stylesheets/style.css" should not contain "I am in the layout"
-    And the file "stylesheets/style2.css" should contain "section"
-    And the file "stylesheets/style2.css" should not contain "I am in the layout"
-    And the file "stylesheets/style3.css" should contain "color"
-    And the file "stylesheets/style3.css" should not contain "I am in the layout"
\ No newline at end of file
diff --git a/middleman-core/fixtures/asciidoc-app/source/code.adoc b/middleman-core/fixtures/asciidoc-app/source/code.html.adoc
similarity index 100%
rename from middleman-core/fixtures/asciidoc-app/source/code.adoc
rename to middleman-core/fixtures/asciidoc-app/source/code.html.adoc
diff --git a/middleman-core/fixtures/asciidoc-app/source/custom-attribute.adoc b/middleman-core/fixtures/asciidoc-app/source/custom-attribute.html.adoc
similarity index 100%
rename from middleman-core/fixtures/asciidoc-app/source/custom-attribute.adoc
rename to middleman-core/fixtures/asciidoc-app/source/custom-attribute.html.adoc
diff --git a/middleman-core/fixtures/asciidoc-app/source/gallery.adoc b/middleman-core/fixtures/asciidoc-app/source/gallery.html.adoc
similarity index 100%
rename from middleman-core/fixtures/asciidoc-app/source/gallery.adoc
rename to middleman-core/fixtures/asciidoc-app/source/gallery.html.adoc
diff --git a/middleman-core/fixtures/asciidoc-app/source/hello-no-layout.adoc b/middleman-core/fixtures/asciidoc-app/source/hello-no-layout.html.adoc
similarity index 100%
rename from middleman-core/fixtures/asciidoc-app/source/hello-no-layout.adoc
rename to middleman-core/fixtures/asciidoc-app/source/hello-no-layout.html.adoc
diff --git a/middleman-core/fixtures/asciidoc-app/source/hello-with-front-matter.adoc b/middleman-core/fixtures/asciidoc-app/source/hello-with-front-matter.html.adoc
similarity index 100%
rename from middleman-core/fixtures/asciidoc-app/source/hello-with-front-matter.adoc
rename to middleman-core/fixtures/asciidoc-app/source/hello-with-front-matter.html.adoc
diff --git a/middleman-core/fixtures/asciidoc-app/source/hello-with-layout.adoc b/middleman-core/fixtures/asciidoc-app/source/hello-with-layout.html.adoc
similarity index 100%
rename from middleman-core/fixtures/asciidoc-app/source/hello-with-layout.adoc
rename to middleman-core/fixtures/asciidoc-app/source/hello-with-layout.html.adoc
diff --git a/middleman-core/fixtures/asciidoc-app/source/hello-with-title.adoc b/middleman-core/fixtures/asciidoc-app/source/hello-with-title.html.adoc
similarity index 100%
rename from middleman-core/fixtures/asciidoc-app/source/hello-with-title.adoc
rename to middleman-core/fixtures/asciidoc-app/source/hello-with-title.html.adoc
diff --git a/middleman-core/fixtures/asciidoc-app/source/hello.adoc b/middleman-core/fixtures/asciidoc-app/source/hello.html.adoc
similarity index 100%
rename from middleman-core/fixtures/asciidoc-app/source/hello.adoc
rename to middleman-core/fixtures/asciidoc-app/source/hello.html.adoc
diff --git a/middleman-core/fixtures/asciidoc-app/source/master.adoc b/middleman-core/fixtures/asciidoc-app/source/master.html.adoc
similarity index 100%
rename from middleman-core/fixtures/asciidoc-app/source/master.adoc
rename to middleman-core/fixtures/asciidoc-app/source/master.html.adoc
diff --git a/middleman-core/fixtures/frontmatter-app/source/front-matter-auto.erb b/middleman-core/fixtures/frontmatter-app/source/front-matter-auto.erb
deleted file mode 100644
index fcae7374..00000000
--- a/middleman-core/fixtures/frontmatter-app/source/front-matter-auto.erb
+++ /dev/null
@@ -1,6 +0,0 @@
----
-layout: false
-title: This is the title
----
-
-<h1><%= current_page.data.title %></h1>
diff --git a/middleman-core/fixtures/frontmatter-app/source/json-front-matter-auto.erb b/middleman-core/fixtures/frontmatter-app/source/json-front-matter-auto.erb
deleted file mode 100644
index da001783..00000000
--- a/middleman-core/fixtures/frontmatter-app/source/json-front-matter-auto.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-;;;
-  "layout": false,
-  "title":  "This is the title"
-;;;
-
-<h1><%= current_page.data.title %></h1>
diff --git a/middleman-core/fixtures/frontmatter-neighbor-app/source/front-matter-auto.erb b/middleman-core/fixtures/frontmatter-neighbor-app/source/front-matter-auto.erb
deleted file mode 100644
index 1ae95c52..00000000
--- a/middleman-core/fixtures/frontmatter-neighbor-app/source/front-matter-auto.erb
+++ /dev/null
@@ -1 +0,0 @@
-<h1><%= current_page.data.title %></h1>
diff --git a/middleman-core/fixtures/frontmatter-neighbor-app/source/front-matter-auto.erb.frontmatter b/middleman-core/fixtures/frontmatter-neighbor-app/source/front-matter-auto.erb.frontmatter
deleted file mode 100644
index 6227e9ef..00000000
--- a/middleman-core/fixtures/frontmatter-neighbor-app/source/front-matter-auto.erb.frontmatter
+++ /dev/null
@@ -1,4 +0,0 @@
----
-layout: false
-title: This is the title
----
diff --git a/middleman-core/fixtures/frontmatter-neighbor-app/source/json-front-matter-auto.erb b/middleman-core/fixtures/frontmatter-neighbor-app/source/json-front-matter-auto.erb
deleted file mode 100644
index 1ae95c52..00000000
--- a/middleman-core/fixtures/frontmatter-neighbor-app/source/json-front-matter-auto.erb
+++ /dev/null
@@ -1 +0,0 @@
-<h1><%= current_page.data.title %></h1>
diff --git a/middleman-core/fixtures/frontmatter-neighbor-app/source/json-front-matter-auto.erb.frontmatter b/middleman-core/fixtures/frontmatter-neighbor-app/source/json-front-matter-auto.erb.frontmatter
deleted file mode 100644
index 415cefbc..00000000
--- a/middleman-core/fixtures/frontmatter-neighbor-app/source/json-front-matter-auto.erb.frontmatter
+++ /dev/null
@@ -1,4 +0,0 @@
-;;;
-  "layout": false,
-  "title":  "This is the title"
-;;;
\ No newline at end of file
diff --git a/middleman-core/fixtures/i18n-force-locale/source/index.haml b/middleman-core/fixtures/i18n-force-locale/source/index.html.haml
similarity index 100%
rename from middleman-core/fixtures/i18n-force-locale/source/index.haml
rename to middleman-core/fixtures/i18n-force-locale/source/index.html.haml
diff --git a/middleman-core/fixtures/i18n-test-app/source/localizable/one.en.md b/middleman-core/fixtures/i18n-test-app/source/localizable/one.en.html.md
similarity index 100%
rename from middleman-core/fixtures/i18n-test-app/source/localizable/one.en.md
rename to middleman-core/fixtures/i18n-test-app/source/localizable/one.en.html.md
diff --git a/middleman-core/fixtures/i18n-test-app/source/localizable/one.es.md b/middleman-core/fixtures/i18n-test-app/source/localizable/one.es.html.md
similarity index 100%
rename from middleman-core/fixtures/i18n-test-app/source/localizable/one.es.md
rename to middleman-core/fixtures/i18n-test-app/source/localizable/one.es.html.md
diff --git a/middleman-core/fixtures/implied-extensions-app/config.rb b/middleman-core/fixtures/implied-extensions-app/config.rb
deleted file mode 100644
index e69de29b..00000000
diff --git a/middleman-core/fixtures/implied-extensions-app/source/index.erb b/middleman-core/fixtures/implied-extensions-app/source/index.erb
deleted file mode 100644
index 89fb406c..00000000
--- a/middleman-core/fixtures/implied-extensions-app/source/index.erb
+++ /dev/null
@@ -1 +0,0 @@
-hello: <%= "world" %>
\ No newline at end of file
diff --git a/middleman-core/fixtures/more-implied-extensions-app/config.rb b/middleman-core/fixtures/more-implied-extensions-app/config.rb
deleted file mode 100644
index e69de29b..00000000
diff --git a/middleman-core/fixtures/more-implied-extensions-app/source/javascripts/app.coffee b/middleman-core/fixtures/more-implied-extensions-app/source/javascripts/app.coffee
deleted file mode 100644
index bd6d320d..00000000
--- a/middleman-core/fixtures/more-implied-extensions-app/source/javascripts/app.coffee
+++ /dev/null
@@ -1 +0,0 @@
-hello = (args...) -> "derp"
\ No newline at end of file
diff --git a/middleman-core/fixtures/more-implied-extensions-app/source/layouts/layout.erb b/middleman-core/fixtures/more-implied-extensions-app/source/layouts/layout.erb
deleted file mode 100644
index ede19525..00000000
--- a/middleman-core/fixtures/more-implied-extensions-app/source/layouts/layout.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-I am in the layout
-
-<%= yield %>
\ No newline at end of file
diff --git a/middleman-core/fixtures/more-implied-extensions-app/source/stylesheets/style.scss b/middleman-core/fixtures/more-implied-extensions-app/source/stylesheets/style.scss
deleted file mode 100644
index d8847a80..00000000
--- a/middleman-core/fixtures/more-implied-extensions-app/source/stylesheets/style.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-@import "compass";
-
-@include global-reset;
\ No newline at end of file
diff --git a/middleman-core/fixtures/more-implied-extensions-app/source/stylesheets/style2.sass b/middleman-core/fixtures/more-implied-extensions-app/source/stylesheets/style2.sass
deleted file mode 100644
index 661ca0a8..00000000
--- a/middleman-core/fixtures/more-implied-extensions-app/source/stylesheets/style2.sass
+++ /dev/null
@@ -1,3 +0,0 @@
-@import "compass"
-
-+global-reset
\ No newline at end of file
diff --git a/middleman-core/fixtures/more-implied-extensions-app/source/stylesheets/style3.less b/middleman-core/fixtures/more-implied-extensions-app/source/stylesheets/style3.less
deleted file mode 100644
index 420d50d4..00000000
--- a/middleman-core/fixtures/more-implied-extensions-app/source/stylesheets/style3.less
+++ /dev/null
@@ -1,4 +0,0 @@
-@base: #f938ab;
-.box { 
-  color: @base;
-}
\ No newline at end of file
diff --git a/middleman-core/fixtures/more-implied-extensions-app/source/test.haml b/middleman-core/fixtures/more-implied-extensions-app/source/test.haml
deleted file mode 100644
index b79ea27c..00000000
--- a/middleman-core/fixtures/more-implied-extensions-app/source/test.haml
+++ /dev/null
@@ -1,4 +0,0 @@
-!!!
-%html
-  %body
-    Hello
\ No newline at end of file
diff --git a/middleman-core/fixtures/more-implied-extensions-app/source/test2.markdown b/middleman-core/fixtures/more-implied-extensions-app/source/test2.markdown
deleted file mode 100644
index 763a7558..00000000
--- a/middleman-core/fixtures/more-implied-extensions-app/source/test2.markdown
+++ /dev/null
@@ -1,3 +0,0 @@
-# Hello
-
-## World
\ No newline at end of file
diff --git a/middleman-core/fixtures/more-implied-extensions-app/source/test3.slim b/middleman-core/fixtures/more-implied-extensions-app/source/test3.slim
deleted file mode 100644
index 69eaa720..00000000
--- a/middleman-core/fixtures/more-implied-extensions-app/source/test3.slim
+++ /dev/null
@@ -1,3 +0,0 @@
-html
-  body
-    | Howdy
\ No newline at end of file
diff --git a/middleman-core/fixtures/more-implied-extensions-app/source/test4.liquid b/middleman-core/fixtures/more-implied-extensions-app/source/test4.liquid
deleted file mode 100644
index dab9ce8f..00000000
--- a/middleman-core/fixtures/more-implied-extensions-app/source/test4.liquid
+++ /dev/null
@@ -1 +0,0 @@
-{{ 'Hello' | upcase }}
\ No newline at end of file
diff --git a/middleman-core/fixtures/more-markdown-app/source/with_layout.markdown b/middleman-core/fixtures/more-markdown-app/source/with_layout.html.markdown
similarity index 100%
rename from middleman-core/fixtures/more-markdown-app/source/with_layout.markdown
rename to middleman-core/fixtures/more-markdown-app/source/with_layout.html.markdown
diff --git a/middleman-core/fixtures/more-markdown-app/source/with_layout_erb.markdown.erb b/middleman-core/fixtures/more-markdown-app/source/with_layout_erb.html.markdown.erb
similarity index 100%
rename from middleman-core/fixtures/more-markdown-app/source/with_layout_erb.markdown.erb
rename to middleman-core/fixtures/more-markdown-app/source/with_layout_erb.html.markdown.erb
diff --git a/middleman-core/lib/middleman-core/config_context.rb b/middleman-core/lib/middleman-core/config_context.rb
index 40e7ef88..944ff2fb 100644
--- a/middleman-core/lib/middleman-core/config_context.rb
+++ b/middleman-core/lib/middleman-core/config_context.rb
@@ -6,7 +6,7 @@ module Middleman
     attr_reader :app
 
     # Whitelist methods that can reach out.
-    delegate :config, :logger, :activate, :use, :map, :mime_type, :data, :template_extensions, :root, :to => :app
+    delegate :config, :logger, :activate, :use, :map, :mime_type, :data, :root, :to => :app
 
     def initialize(app, template_context_class)
       @app = app
diff --git a/middleman-core/lib/middleman-core/core_extensions/rendering.rb b/middleman-core/lib/middleman-core/core_extensions/rendering.rb
index 12b8e734..a77f853f 100644
--- a/middleman-core/lib/middleman-core/core_extensions/rendering.rb
+++ b/middleman-core/lib/middleman-core/core_extensions/rendering.rb
@@ -11,9 +11,6 @@ module Middleman
 
         # Once registered
         def included(app)
-          # Include methods
-          app.send :include, InstanceMethods
-
           app.define_hook :before_render
           app.define_hook :after_render
 
@@ -98,20 +95,6 @@ module Middleman
           end
         end
       end
-
-      # Rendering instance methods
-      module InstanceMethods
-
-        # Add or overwrite a default template extension
-        #
-        # @param [Hash] extension_map
-        # @return [Hash]
-        def template_extensions(extension_map=nil)
-          @_template_extensions ||= {}
-          @_template_extensions.merge!(extension_map) if extension_map
-          @_template_extensions
-        end
-      end
     end
   end
 end
diff --git a/middleman-core/lib/middleman-core/renderers/asciidoc.rb b/middleman-core/lib/middleman-core/renderers/asciidoc.rb
index c58f7150..877d4f8f 100644
--- a/middleman-core/lib/middleman-core/renderers/asciidoc.rb
+++ b/middleman-core/lib/middleman-core/renderers/asciidoc.rb
@@ -12,9 +12,6 @@ module Middleman
             :attributes => %W(showtitle env=middleman env-middleman middleman-version=#{::Middleman::VERSION})
           }, 'AsciiDoc engine options (Hash)'
           app.config.define_setting :asciidoc_attributes, [], 'AsciiDoc custom attributes (Array)'
-          app.before_configuration do
-            template_extensions :adoc => :html
-          end
 
           app.after_configuration do
             # QUESTION should base_dir be equal to docdir instead?
diff --git a/middleman-core/lib/middleman-core/renderers/coffee_script.rb b/middleman-core/lib/middleman-core/renderers/coffee_script.rb
index 92b30f38..3f87d1fa 100644
--- a/middleman-core/lib/middleman-core/renderers/coffee_script.rb
+++ b/middleman-core/lib/middleman-core/renderers/coffee_script.rb
@@ -16,7 +16,6 @@ module Middleman
           ::Tilt.prefer(DebuggingCoffeeScriptTemplate)
 
           app.before_configuration do
-            template_extensions :coffee => :js
             DebuggingCoffeeScriptTemplate.middleman_app = self
           end
         end
diff --git a/middleman-core/lib/middleman-core/renderers/erb.rb b/middleman-core/lib/middleman-core/renderers/erb.rb
index 87f91c82..89f93bac 100644
--- a/middleman-core/lib/middleman-core/renderers/erb.rb
+++ b/middleman-core/lib/middleman-core/renderers/erb.rb
@@ -7,10 +7,6 @@ module Middleman
 
         # once registered
         def registered(app)
-          app.before_configuration do
-            template_extensions :erb => :html
-          end
-
           # After config
           app.after_configuration do
             ::Tilt.prefer(Template, :erb)
diff --git a/middleman-core/lib/middleman-core/renderers/haml.rb b/middleman-core/lib/middleman-core/renderers/haml.rb
index e561de13..fc450417 100644
--- a/middleman-core/lib/middleman-core/renderers/haml.rb
+++ b/middleman-core/lib/middleman-core/renderers/haml.rb
@@ -44,10 +44,6 @@ module Middleman
         def registered(app)
           ::Tilt.prefer(::Middleman::Renderers::HamlTemplate, 'haml')
 
-          app.before_configuration do
-            template_extensions :haml => :html
-          end
-
           # Add haml helpers to context
           ::Middleman::TemplateContext.send :include, ::Haml::Helpers
         end
diff --git a/middleman-core/lib/middleman-core/renderers/less.rb b/middleman-core/lib/middleman-core/renderers/less.rb
index 2f560073..d09e1ac9 100644
--- a/middleman-core/lib/middleman-core/renderers/less.rb
+++ b/middleman-core/lib/middleman-core/renderers/less.rb
@@ -14,10 +14,6 @@ module Middleman
           # Default less options
           app.config.define_setting :less, {}, 'LESS compiler options'
 
-          app.before_configuration do
-            template_extensions :less => :css
-          end
-
           app.after_configuration do
             ::Less.paths << File.join(source_dir, config[:css_dir])
           end
diff --git a/middleman-core/lib/middleman-core/renderers/liquid.rb b/middleman-core/lib/middleman-core/renderers/liquid.rb
index 8bbac6ec..3596432e 100644
--- a/middleman-core/lib/middleman-core/renderers/liquid.rb
+++ b/middleman-core/lib/middleman-core/renderers/liquid.rb
@@ -12,10 +12,6 @@ module Middleman
 
         # Once registerd
         def registered(app)
-          app.before_configuration do
-            template_extensions :liquid => :html
-          end
-
           # After config, setup liquid partial paths
           app.after_configuration do
             ::Liquid::Template.file_system = ::Liquid::LocalFileSystem.new(source_dir)
diff --git a/middleman-core/lib/middleman-core/renderers/markdown.rb b/middleman-core/lib/middleman-core/renderers/markdown.rb
index 57272896..90889edb 100644
--- a/middleman-core/lib/middleman-core/renderers/markdown.rb
+++ b/middleman-core/lib/middleman-core/renderers/markdown.rb
@@ -13,14 +13,6 @@ module Middleman
           app.config.define_setting :markdown_engine, :kramdown, 'Preferred markdown engine'
           app.config.define_setting :markdown_engine_prefix, ::Tilt, 'The parent module for markdown template engines'
 
-          app.before_configuration do
-            template_extensions :markdown => :html,
-                                :mdown    => :html,
-                                :md       => :html,
-                                :mkd      => :html,
-                                :mkdn     => :html
-          end
-
           # Once configuration is parsed
           app.after_configuration do
             markdown_exts = %w(markdown mdown md mkd mkdn)
diff --git a/middleman-core/lib/middleman-core/renderers/sass.rb b/middleman-core/lib/middleman-core/renderers/sass.rb
index bd38722a..498afbc3 100644
--- a/middleman-core/lib/middleman-core/renderers/sass.rb
+++ b/middleman-core/lib/middleman-core/renderers/sass.rb
@@ -14,11 +14,6 @@ module Middleman
           # Default sass options
           app.config.define_setting :sass, {}, 'Sass engine options'
 
-          app.before_configuration do
-            template_extensions :scss => :css,
-                                :sass => :css
-          end
-
           # Tell Tilt to use it as well (for inline sass blocks)
           ::Tilt.register 'sass', SassPlusCSSFilenameTemplate
           ::Tilt.prefer(SassPlusCSSFilenameTemplate)
diff --git a/middleman-core/lib/middleman-core/renderers/slim.rb b/middleman-core/lib/middleman-core/renderers/slim.rb
index f9f6a28f..c10727ef 100644
--- a/middleman-core/lib/middleman-core/renderers/slim.rb
+++ b/middleman-core/lib/middleman-core/renderers/slim.rb
@@ -26,10 +26,6 @@ module Middleman
 
         # Once registered
         def registered(app)
-          app.before_configuration do
-            template_extensions :slim => :html
-          end
-
           # Setup Slim options to work with partials
           ::Slim::Engine.set_default_options(
             :buffer    => '@_out_buf',
diff --git a/middleman-core/lib/middleman-core/renderers/stylus.rb b/middleman-core/lib/middleman-core/renderers/stylus.rb
index 72a4cba8..6fbdb455 100644
--- a/middleman-core/lib/middleman-core/renderers/stylus.rb
+++ b/middleman-core/lib/middleman-core/renderers/stylus.rb
@@ -14,11 +14,6 @@ module Middleman
         def registered(app)
           # Default stylus options
           app.config.define_setting :styl, {}, 'Stylus config options'
-
-
-          app.before_configuration do
-            template_extensions :styl => :css
-          end
         end
 
         alias :included :registered
diff --git a/middleman-core/lib/middleman-core/sitemap/store.rb b/middleman-core/lib/middleman-core/sitemap/store.rb
index 0dc16267..217fa6c3 100644
--- a/middleman-core/lib/middleman-core/sitemap/store.rb
+++ b/middleman-core/lib/middleman-core/sitemap/store.rb
@@ -205,11 +205,7 @@ module Middleman
       # @return [String]
       def extensionless_path(file)
         path = file.dup
-        path = remove_templating_extensions(path)
-
-        # If there is no extension, look for one
-        path = find_extension(path, file) if File.extname(strip_away_locale(path)).empty?
-        path
+        remove_templating_extensions(path)
       end
 
       # Actually update the resource list, assuming anything has called
@@ -271,22 +267,6 @@ module Middleman
 
         path
       end
-
-      # Finds an extension for path according to file's extension
-      # @param [String] path without extension
-      # @param [String] file path with original extensions
-      def find_extension(path, file)
-        input_ext = File.extname(file)
-
-        if !input_ext.empty?
-          input_ext = input_ext.split('.').last.to_sym
-          if @app.template_extensions.has_key?(input_ext)
-            path << ".#{@app.template_extensions[input_ext]}"
-          end
-        end
-
-        path
-      end
     end
   end
 end