diff --git a/docs/guides/src/asciidoc/_hello-includes/secure-the-application.asc b/docs/guides/src/asciidoc/_hello-includes/secure-the-application.asc
index 95f4463d3b..ff0fcae8bc 100644
--- a/docs/guides/src/asciidoc/_hello-includes/secure-the-application.asc
+++ b/docs/guides/src/asciidoc/_hello-includes/secure-the-application.asc
@@ -50,8 +50,9 @@ The next step is to create a Spring Security configuration.
 ----
 package org.springframework.security.samples.config;
 
-import org.springframework.context.annotation.*;
-import org.springframework.security.config.annotation.authentication.builders.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
 import org.springframework.security.config.annotation.web.configuration.*;
 
 @Configuration
diff --git a/samples/insecuremvc/src/main/webapp/WEB-INF/decorators.xml b/samples/insecuremvc/src/main/webapp/WEB-INF/decorators.xml
deleted file mode 100644
index a4542da250..0000000000
--- a/samples/insecuremvc/src/main/webapp/WEB-INF/decorators.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<decorators defaultdir="/WEB-INF/decorators">
-    <decorator name="main" page="main.jsp">
-          <pattern>/*</pattern>
-    </decorator>
-</decorators>
diff --git a/samples/insecuremvc/src/main/webapp/WEB-INF/decorators/main.jsp b/samples/insecuremvc/src/main/webapp/WEB-INF/decorators/main.jsp
deleted file mode 100644
index 4e19966a33..0000000000
--- a/samples/insecuremvc/src/main/webapp/WEB-INF/decorators/main.jsp
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
-    xmlns:c="http://java.sun.com/jsp/jstl/core"
-    xmlns:fn="http://java.sun.com/jsp/jstl/functions"
-    xmlns:decorator="http://www.opensymphony.com/sitemesh/decorator"
-    xmlns:page="http://www.opensymphony.com/sitemesh/page"
-    xmlns:form="http://www.springframework.org/tags/form"
-    xmlns:spring="http://www.springframework.org/tags"
-    xmlns:sec="http://www.springframework.org/security/tags"
-    xmlns:tags="urn:jsptagdir:/WEB-INF/tags" version="2.0">
-
-  <jsp:directive.page contentType="text/html" pageEncoding="UTF-8" />
-  <jsp:output omit-xml-declaration="true" />
-  <jsp:output doctype-root-element="HTML"
-              doctype-system="about:legacy-compat" />
-<html lang="en">
-  <head>
-    <title>SecureMail: <decorator:title/></title>
-    <c:url var="faviconUrl" value="/resources/img/favicon.ico"/>
-    <link rel="icon" type="image/x-icon" href="${faviconUrl}"/>
-    <c:url var="bootstrapUrl" value="/resources/css/bootstrap.css"/>
-    <link href="${bootstrapUrl}" rel="stylesheet"></link>
-    <style type="text/css">
-      /* Sticky footer styles
-      -------------------------------------------------- */
-
-      html,
-      body {
-        height: 100%;
-        /* The html and body elements cannot have any padding or margin. */
-      }
-
-      /* Wrapper for page content to push down footer */
-      #wrap {
-        min-height: 100%;
-        height: auto !important;
-        height: 100%;
-        /* Negative indent footer by it's height */
-        margin: 0 auto -60px;
-      }
-
-      /* Set the fixed height of the footer here */
-      #push,
-      #footer {
-        height: 60px;
-      }
-      #footer {
-        background-color: #f5f5f5;
-      }
-
-      /* Lastly, apply responsive CSS fixes as necessary */
-      @media (max-width: 767px) {
-        #footer {
-          margin-left: -20px;
-          margin-right: -20px;
-          padding-left: 20px;
-          padding-right: 20px;
-        }
-      }
-
-
-
-      /* Custom page CSS
-      -------------------------------------------------- */
-      /* Not required for template or sticky footer method. */
-
-      .container {
-        width: auto;
-        max-width: 680px;
-      }
-      .container .credit {
-        margin: 20px 0;
-        text-align: center;
-      }
-      a {
-          color: green;
-      }
-      .navbar-form {
-        margin-left: 1em;
-      }
-    </style>
-    <c:url var="bootstrapResponsiveUrl" value="/resources/css/bootstrap-responsive.css"/>
-    <link href="${bootstrapResponsiveUrl}" rel="stylesheet"></link>
-
-    <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
-    <!--[if lt IE 9]>
-      <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-  </head>
-
-
-  <body>
-    <div id="wrap">
-      <div class="navbar navbar-inverse navbar-static-top">
-        <div class="navbar-inner">
-          <div class="container">
-            <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-              <span class="icon-bar"></span>
-              <span class="icon-bar"></span>
-              <span class="icon-bar"></span>
-            </a>
-            <c:url var="homeUrl" value="/"/>
-            <c:url var="logoUrl" value="/resources/img/logo.png"/>
-            <a class="brand" href="${homeUrl}"><img src="${logoUrl}" alt="Spring Security Sample"/></a>
-            <div class="nav-collapse collapse">
-             <!-- <c:if test="${pageContext.request.remoteUser != null}">
-                  <c:url var="logoutUrl" value="/logout"/>
-                  <form:form class="navbar-form pull-right" action="${logoutUrl}" method="post"><input type="submit" value="Log out" /></form:form>
-                  <p class="navbar-text pull-right">
-                    <c:out value="${pageContext.request.remoteUser}"/>
-                  </p>
-              </c:if> -->
-              <ul class="nav">
-                <c:url var="inboxUrl" value="/"/>
-                <li><a href="${inboxUrl}">Inbox</a></li>
-                <c:url var="composeUrl" value="/?form"/>
-                <li><a href="${composeUrl}">Compose</a></li>
-              </ul>
-            </div>
-          </div>
-      </div>
-    </div>
-      <!-- Begin page content -->
-      <div class="container">
-        <decorator:body/>
-      </div>
-
-      <div id="push"><!--  --></div>
-    </div>
-
-    <div id="footer">
-      <div class="container">
-        <p class="muted credit">Visit the <a href="#">Spring Security</a> site for more <a href="#">samples</a>.</p>
-      </div>
-    </div>
-  </body>
-</html>
-</jsp:root>
\ No newline at end of file
diff --git a/samples/insecuremvc/src/main/webapp/WEB-INF/views/messages/compose.jspx b/samples/insecuremvc/src/main/webapp/WEB-INF/views/messages/compose.jspx
deleted file mode 100644
index a92f7e2d6c..0000000000
--- a/samples/insecuremvc/src/main/webapp/WEB-INF/views/messages/compose.jspx
+++ /dev/null
@@ -1,26 +0,0 @@
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
-    xmlns:spring="http://www.springframework.org/tags"
-    xmlns:c="http://java.sun.com/jsp/jstl/core"
-    xmlns:form="http://www.springframework.org/tags/form" version="2.0">
-    <jsp:directive.page language="java" contentType="text/html" />
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-    <head>
-        <title>Compose</title>
-    </head>
-    <body>
-        <div class="container">
-            <h1>Messages : Create</h1>
-            <form:form action="./" method="post" modelAttribute="message">
-                <form:errors path="*" element="div" cssClass="alert alert-error" />
-                <label for="summary">Summary</label>
-                <form:input type="text" path="summary" class="input-xxlarge" />
-                <label for="text">Message</label>
-                <form:textarea path="text" class="input-xxlarge"></form:textarea>
-                <div class="form-actions">
-                    <input type="submit" value="Create" />
-                </div>
-            </form:form>
-        </div>
-    </body>
-    </html>
-</jsp:root>
\ No newline at end of file
diff --git a/samples/insecuremvc/src/main/webapp/WEB-INF/views/messages/inbox.jspx b/samples/insecuremvc/src/main/webapp/WEB-INF/views/messages/inbox.jspx
deleted file mode 100644
index ed02d313c6..0000000000
--- a/samples/insecuremvc/src/main/webapp/WEB-INF/views/messages/inbox.jspx
+++ /dev/null
@@ -1,40 +0,0 @@
-<jsp:root
-   xmlns:jsp="http://java.sun.com/JSP/Page"
-   xmlns:spring="http://www.springframework.org/tags"
-   xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:form="http://www.springframework.org/tags/form"
-   xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
-   version="2.0">
-   <jsp:directive.page language="java" contentType="text/html"/>
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-    <head>
-        <title>Inbox</title>
-    </head>
-    <body>
-        <h1>Inbox</h1>
-        <table class="table">
-            <thead>
-                <tr>
-                    <th>Created</th>
-                    <th>Summary</th>
-                </tr>
-            </thead>
-            <tbody>
-            <c:if test="${empty messages}">
-                <tr>
-                    <td colspan="2" class="msg">You have not received any mail yet.</td>
-                </tr>
-            </c:if>
-            <c:forEach items="${messages}" var="message">
-                <tr>
-                    <td><fmt:formatDate value="${message.created.time}"/></td>
-                    <spring:url var="messageUrl" value="/{id}">
-                        <spring:param name="id" value="${message.id}"/>
-                    </spring:url>
-                    <td><a href="${messageUrl}"><c:out value="${message.summary}"/></a></td>
-                   </tr>
-               </c:forEach>
-               </tbody>
-        </table>
-    </body>
-</html>
-</jsp:root>
\ No newline at end of file
diff --git a/samples/insecuremvc/src/main/webapp/WEB-INF/views/messages/show.jspx b/samples/insecuremvc/src/main/webapp/WEB-INF/views/messages/show.jspx
deleted file mode 100644
index 82007c267b..0000000000
--- a/samples/insecuremvc/src/main/webapp/WEB-INF/views/messages/show.jspx
+++ /dev/null
@@ -1,24 +0,0 @@
-<jsp:root
-   xmlns:jsp="http://java.sun.com/JSP/Page"
-   xmlns:spring="http://www.springframework.org/tags"
-   xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
-   xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:form="http://www.springframework.org/tags/form"
-   version="2.0">
-   <jsp:directive.page language="java" contentType="text/html"/>
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-    <head>
-        <title><c:out value="${message.summary}"/></title>
-    </head>
-    <body>
-        <div class="container">
-            <h1>Message : <c:out value="${message.summary}"/></h1>
-            <dl>
-              <dt>Created</dt>
-              <dd><fmt:formatDate value="${message.created.time}"/></dd>
-              <dt>Message</dt>
-              <dd><c:out value="${message.text}"/></dd>
-            </dl>
-      </div>
-    </body>
-</html>
-</jsp:root>
\ No newline at end of file
