diff --git a/src/main/webapp/WEB-INF/jsp/exception.jsp b/src/main/webapp/WEB-INF/jsp/exception.jsp
deleted file mode 100644
index 876fb04a3..000000000
--- a/src/main/webapp/WEB-INF/jsp/exception.jsp
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE html> 
-
-<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-
-<html lang="en">
-<jsp:include page="fragments/staticFiles.jsp"/>
-
-<body>
-<div class="container">
-    <jsp:include page="fragments/bodyHeader.jsp"/>
-    <spring:url value="/resources/images/pets.png" var="petsImage"/>
-    <img src="${petsImage}"/>
-
-    <h2>Something happened...</h2>
-
-    <p>${exception.message}</p>
-
-    <!-- Exception: ${exception.message}.
-		  	<c:forEach items="${exception.stackTrace}" var="stackTrace"> 
-				${stackTrace} 
-			</c:forEach>
-	  	-->
-
-
-    <jsp:include page="fragments/footer.jsp"/>
-
-</div>
-</body>
-
-</html>
diff --git a/src/main/webapp/WEB-INF/jsp/fragments/bodyHeader.jsp b/src/main/webapp/WEB-INF/jsp/fragments/bodyHeader.jsp
deleted file mode 100644
index 583b119f5..000000000
--- a/src/main/webapp/WEB-INF/jsp/fragments/bodyHeader.jsp
+++ /dev/null
@@ -1,22 +0,0 @@
-<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
-
-<spring:url value="/resources/images/banner-graphic.png" var="banner"/>
-<img src="/resources/images/banner-graphic.png"/>
-
-<div class="navbar" style="width: 601px;">
-    <div class="navbar-inner">
-        <ul class="nav">
-            <li style="width: 120px;"><a href="<spring:url value="/" htmlEscape="true" />"><i class="icon-home"></i>
-                Home</a></li>
-            <li style="width: 150px;"><a href="<spring:url value="/owners/find.html" htmlEscape="true" />"><i
-                    class="icon-search"></i> Find owners</a></li>
-            <li style="width: 160px;"><a href="<spring:url value="/vets.html" htmlEscape="true" />"><i
-                    class="icon-th-list"></i> Veterinarians</a></li>
-            <li style="width: 110px;"><a href="<spring:url value="/oups.html" htmlEscape="true" />"
-                                        title="trigger a RuntimeException to see how it is handled"><i
-                    class="icon-warning-sign"></i> Error</a></li>
-        </ul>
-    </div>
-</div>
-	
diff --git a/src/main/webapp/WEB-INF/jsp/fragments/footer.jsp b/src/main/webapp/WEB-INF/jsp/fragments/footer.jsp
deleted file mode 100644
index c9992c782..000000000
--- a/src/main/webapp/WEB-INF/jsp/fragments/footer.jsp
+++ /dev/null
@@ -1,11 +0,0 @@
-<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
-
-<table class="footer">
-    <tr>
-        <td width="70%"></td>
-        <td align="right"><img src="<spring:url value="/resources/images/spring-pivotal-logo.png" htmlEscape="true" />"
-                               alt="Sponsored by Pivotal"/></td>
-    </tr>
-</table>
-
-
diff --git a/src/main/webapp/WEB-INF/jsp/fragments/staticFiles.jsp b/src/main/webapp/WEB-INF/jsp/fragments/staticFiles.jsp
deleted file mode 100644
index f1eea21e6..000000000
--- a/src/main/webapp/WEB-INF/jsp/fragments/staticFiles.jsp
+++ /dev/null
@@ -1,33 +0,0 @@
-<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
-
-<!--
-PetClinic :: a Spring Framework demonstration
--->
-
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-    <title>PetClinic :: a Spring Framework demonstration</title>
-
-
-    <spring:url value="/webjars/bootstrap/2.3.0/css/bootstrap.min.css" var="bootstrapCss"/>
-    <link href="${bootstrapCss}" rel="stylesheet"/>
-
-    <spring:url value="/resources/css/petclinic.css" var="petclinicCss"/>
-    <link href="${petclinicCss}" rel="stylesheet"/>
-
-    <spring:url value="/webjars/jquery/2.0.3/jquery.js" var="jQuery"/>
-    <script src="${jQuery}"></script>
-
-	<!-- jquery-ui.js file is really big so we only load what we need instead of loading everything -->
-    <spring:url value="/webjars/jquery-ui/1.10.3/ui/jquery.ui.core.js" var="jQueryUiCore"/>
-    <script src="${jQueryUiCore}"></script>
-
-	<spring:url value="/webjars/jquery-ui/1.10.3/ui/jquery.ui.datepicker.js" var="jQueryUiDatePicker"/>
-    <script src="${jQueryUiDatePicker}"></script>
-    
-    <!-- jquery-ui.css file is not that big so we can afford to load it -->
-    <spring:url value="/webjars/jquery-ui/1.10.3/themes/base/jquery-ui.css" var="jQueryUiCss"/>
-    <link href="${jQueryUiCss}" rel="stylesheet"></link>
-</head>
-
-
diff --git a/src/main/webapp/WEB-INF/jsp/owners/createOrUpdateOwnerForm.jsp b/src/main/webapp/WEB-INF/jsp/owners/createOrUpdateOwnerForm.jsp
deleted file mode 100644
index 0479f0bde..000000000
--- a/src/main/webapp/WEB-INF/jsp/owners/createOrUpdateOwnerForm.jsp
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html> 
-
-<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
-<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
-<%@ taglib prefix="petclinic" tagdir="/WEB-INF/tags" %>
-
-
-<html lang="en">
-
-<jsp:include page="../fragments/staticFiles.jsp"/>
-
-<body>
-<div class="container">
-    <jsp:include page="../fragments/bodyHeader.jsp"/>
-    <c:choose>
-        <c:when test="${owner['new']}"><c:set var="method" value="post"/></c:when>
-        <c:otherwise><c:set var="method" value="put"/></c:otherwise>
-    </c:choose>
-
-    <h2>
-        <c:if test="${owner['new']}">New </c:if> Owner
-    </h2>
-    <form:form modelAttribute="owner" method="${method}" class="form-horizontal" id="add-owner-form">
-        <petclinic:inputField label="First Name" name="firstName"/>
-        <petclinic:inputField label="Last Name" name="lastName"/>
-        <petclinic:inputField label="Address" name="address"/>
-        <petclinic:inputField label="City" name="city"/>
-        <petclinic:inputField label="Telephone" name="telephone"/>
-
-        <div class="form-actions">
-            <c:choose>
-                <c:when test="${owner['new']}">
-                    <button type="submit">Add Owner</button>
-                </c:when>
-                <c:otherwise>
-                    <button type="submit">Update Owner</button>
-                </c:otherwise>
-            </c:choose>
-        </div>
-    </form:form>
-</div>
-<jsp:include page="../fragments/footer.jsp"/>
-</body>
-
-</html>
diff --git a/src/main/webapp/WEB-INF/jsp/owners/findOwners.jsp b/src/main/webapp/WEB-INF/jsp/owners/findOwners.jsp
deleted file mode 100644
index 91d2ebabc..000000000
--- a/src/main/webapp/WEB-INF/jsp/owners/findOwners.jsp
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html> 
-
-<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
-<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
-<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
-
-<html lang="en">
-
-<jsp:include page="../fragments/staticFiles.jsp"/>
-
-<body>
-<div class="container">
-    <jsp:include page="../fragments/bodyHeader.jsp"/>
-
-    <h2>Find Owners</h2>
-
-    <spring:url value="/owners.html" var="formUrl"/>
-    <form:form modelAttribute="owner" action="${fn:escapeXml(formUrl)}" method="get" class="form-horizontal"
-               id="search-owner-form">
-        <fieldset>
-            <div class="control-group" id="lastName">
-                <label class="control-label">Last name </label>
-                <form:input path="lastName" size="30" maxlength="80"/>
-                <span class="help-inline"><form:errors path="*"/></span>
-            </div>
-            <div class="form-actions">
-                <button type="submit">Find Owner</button>
-            </div>
-        </fieldset>
-    </form:form>
-
-    <br/>
-    <a href='<spring:url value="/owners/new" htmlEscape="true"/>'>Add Owner</a>
-
-    <jsp:include page="../fragments/footer.jsp"/>
-
-</div>
-</body>
-
-</html>
diff --git a/src/main/webapp/WEB-INF/jsp/owners/ownerDetails.jsp b/src/main/webapp/WEB-INF/jsp/owners/ownerDetails.jsp
deleted file mode 100644
index 4ace4ba23..000000000
--- a/src/main/webapp/WEB-INF/jsp/owners/ownerDetails.jsp
+++ /dev/null
@@ -1,107 +0,0 @@
-<!DOCTYPE html> 
-
-<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
-<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="joda" uri="http://www.joda.org/joda/time/tags" %>
-
-<html lang="en">
-
-<jsp:include page="../fragments/staticFiles.jsp"/>
-
-<body>
-<div class="container">
-    <jsp:include page="../fragments/bodyHeader.jsp"/>
-
-    <h2>Owner Information</h2>
-
-    <table class="table table-striped" style="width:600px;">
-        <tr>
-            <th>Name</th>
-            <td><b><c:out value="${owner.firstName} ${owner.lastName}"/></b></td>
-        </tr>
-        <tr>
-            <th>Address</th>
-            <td><c:out value="${owner.address}"/></td>
-        </tr>
-        <tr>
-            <th>City</th>
-            <td><c:out value="${owner.city}"/></td>
-        </tr>
-        <tr>
-            <th>Telephone</th>
-            <td><c:out value="${owner.telephone}"/></td>
-        </tr>
-         <tr>
-            <td> 
-            	<spring:url value="{ownerId}/edit.html" var="editUrl">
-                    <spring:param name="ownerId" value="${owner.id}"/>
-                </spring:url>
-                <a href="${fn:escapeXml(editUrl)}" class="btn btn-info">Edit Owner</a></td>
-            <td>
-            	<spring:url value="{ownerId}/pets/new.html" var="addUrl">
-                    <spring:param name="ownerId" value="${owner.id}"/>
-                </spring:url>
-                <a href="${fn:escapeXml(addUrl)}"  class="btn btn-success">Add New Pet</a></td>
-        </tr>
-    </table>
-
-    <h2>Pets and Visits</h2>
-
-    <c:forEach var="pet" items="${owner.pets}">
-        <table class="table" style="width:600px;">
-            <tr>
-                <td valign="top" style="width: 120px;">
-                    <dl class="dl-horizontal">
-                        <dt>Name</dt>
-                        <dd><c:out value="${pet.name}"/></dd>
-                        <dt>Birth Date</dt>
-                        <dd><joda:format value="${pet.birthDate}" pattern="yyyy-MM-dd"/></dd>
-                        <dt>Type</dt>
-                        <dd><c:out value="${pet.type.name}"/></dd>
-                    </dl>
-                </td>
-                <td valign="top">
-                    <table class="table-condensed">
-                        <thead>
-                        <tr>
-                            <th>Visit Date</th>
-                            <th>Description</th>
-                        </tr>
-                        </thead>
-                        <c:forEach var="visit" items="${pet.visits}">
-                            <tr>
-                                <td><joda:format value="${visit.date}" pattern="yyyy-MM-dd"/></td>
-                                <td><c:out value="${visit.description}"/></td>
-                            </tr>
-                        </c:forEach>
-                        <tr>
-                            <td> 
-                            	<spring:url value="/owners/{ownerId}/pets/{petId}/edit" var="petUrl">
-			                        <spring:param name="ownerId" value="${owner.id}"/>
-			                        <spring:param name="petId" value="${pet.id}"/>
-			                    </spring:url>
-			                    <a href="${fn:escapeXml(petUrl)}">Edit Pet</a>
-			                </td>
-                            <td>
-			                    <spring:url value="/owners/{ownerId}/pets/{petId}/visits/new" var="visitUrl">
-			                        <spring:param name="ownerId" value="${owner.id}"/>
-			                        <spring:param name="petId" value="${pet.id}"/>
-			                    </spring:url>
-			                    <a href="${fn:escapeXml(visitUrl)}">Add Visit</a>
-                            </td>
-                       	</tr>
-                    </table>
-                </td>
-            </tr>
-        </table>
-    </c:forEach>
-
-    <jsp:include page="../fragments/footer.jsp"/>
-
-</div>
-
-</body>
-
-</html>
diff --git a/src/main/webapp/WEB-INF/jsp/owners/ownersList.jsp b/src/main/webapp/WEB-INF/jsp/owners/ownersList.jsp
deleted file mode 100644
index 5e8eaaaaa..000000000
--- a/src/main/webapp/WEB-INF/jsp/owners/ownersList.jsp
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE html> 
-
-<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
-<%@ taglib prefix="datatables" uri="http://github.com/dandelion/datatables" %>
-
-<html lang="en">
-
-<jsp:include page="../fragments/staticFiles.jsp"/>
-
-<body>
-<div class="container">
-    <jsp:include page="../fragments/bodyHeader.jsp"/>
-    <h2>Owners</h2>
-    
-    <datatables:table id="owners" data="${selections}" row="owner" theme="bootstrap2" 
-                      cssClass="table table-striped" pageable="false" info="false" export="pdf">
-        <datatables:column title="Name" cssStyle="width: 150px;" display="html">
-            <spring:url value="/owners/{ownerId}.html" var="ownerUrl">
-                <spring:param name="ownerId" value="${owner.id}"/>
-            </spring:url>
-            <a href="${fn:escapeXml(ownerUrl)}"><c:out value="${owner.firstName} ${owner.lastName}"/></a>
-        </datatables:column>
-        <datatables:column title="Name" display="pdf">
-            <c:out value="${owner.firstName} ${owner.lastName}"/>
-        </datatables:column>
-        <datatables:column title="Address" property="address" cssStyle="width: 200px;"/>
-        <datatables:column title="City" property="city"/>
-        <datatables:column title="Telephone" property="telephone"/>
-        <datatables:column title="Pets" cssStyle="width: 100px;">
-            <c:forEach var="pet" items="${owner.pets}">
-                <c:out value="${pet.name}"/>
-            </c:forEach>
-        </datatables:column>
-        <datatables:export type="pdf" cssClass="btn" cssStyle="height: 25px;" />
-    </datatables:table>
-    
-    <jsp:include page="../fragments/footer.jsp"/>
-
-</div>
-</body>
-
-</html>
diff --git a/src/main/webapp/WEB-INF/jsp/pets/createOrUpdateVisitForm.jsp b/src/main/webapp/WEB-INF/jsp/pets/createOrUpdateVisitForm.jsp
index 501a0d48e..85408dfe1 100644
--- a/src/main/webapp/WEB-INF/jsp/pets/createOrUpdateVisitForm.jsp
+++ b/src/main/webapp/WEB-INF/jsp/pets/createOrUpdateVisitForm.jsp
@@ -10,7 +10,6 @@
 
 <html lang="en">
 
-<jsp:include page="../fragments/staticFiles.jsp"/>
 
 
 <body>
@@ -20,7 +19,6 @@
     });
 </script>
 <div class="container">
-    <jsp:include page="../fragments/bodyHeader.jsp"/>
     <h2><c:if test="${visit['new']}">New </c:if>Visit</h2>
 
     <b>Pet</b>
@@ -70,7 +68,6 @@
     </table>
 
 </div>
-<jsp:include page="../fragments/footer.jsp"/>
 </body>
 
 </html>
diff --git a/src/main/webapp/WEB-INF/jsp/vets/vetList.jsp b/src/main/webapp/WEB-INF/jsp/vets/vetList.jsp
deleted file mode 100644
index 040679c28..000000000
--- a/src/main/webapp/WEB-INF/jsp/vets/vetList.jsp
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE html> 
-
-<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="datatables" uri="http://github.com/dandelion/datatables" %>
-
-<html lang="en">
-
-
-<jsp:include page="../fragments/staticFiles.jsp"/>
-
-<body>
-<div class="container">
-    <jsp:include page="../fragments/bodyHeader.jsp"/>
-
-    <h2>Veterinarians</h2>
-
-    <datatables:table id="vets" data="${vets.vetList}" row="vet" theme="bootstrap2" cssClass="table table-striped" pageable="false" info="false">
-        <datatables:column title="Name">
-            <c:out value="${vet.firstName} ${vet.lastName}"></c:out>
-        </datatables:column>
-        <datatables:column title="Specialties">
-            <c:forEach var="specialty" items="${vet.specialties}">
-                <c:out value="${specialty.name}"/>
-            </c:forEach>
-            <c:if test="${vet.nrOfSpecialties == 0}">none</c:if>
-        </datatables:column>
-    </datatables:table>
-    
-    <table class="table-buttons">
-        <tr>
-            <td>
-                <a href="<spring:url value="/vets.xml" htmlEscape="true" />">View as XML</a>
-            </td>
-            <td>
-                <a href="<spring:url value="/vets.json" htmlEscape="true" />">View as JSon</a>
-            </td>
-        </tr>
-    </table>
-
-    <jsp:include page="../fragments/footer.jsp"/>
-</div>
-</body>
-
-</html>
diff --git a/src/main/webapp/WEB-INF/jsp/welcome.jsp b/src/main/webapp/WEB-INF/jsp/welcome.jsp
deleted file mode 100644
index f33b84e55..000000000
--- a/src/main/webapp/WEB-INF/jsp/welcome.jsp
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html> 
-
-<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
-
-
-<html lang="en">
-
-<jsp:include page="fragments/staticFiles.jsp"/>
-
-<body>
-<div class="container">
-    <jsp:include page="fragments/bodyHeader.jsp"/>
-    <h2><fmt:message key="welcome"/></h2>
-    <spring:url value="/resources/images/pets.png" htmlEscape="true" var="petsImage"/>
-    <img src="${petsImage}"/>
-
-    <jsp:include page="fragments/footer.jsp"/>
-
-</div>
-</body>
-
-</html>

Name
Address
City
Telephone
- - - - Edit Owner	- - - - Add New Pet