diff --git a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/aboutContent.tag b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/aboutContent.tag
deleted file mode 100644
index 4d4ca8bb0..000000000
--- a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/aboutContent.tag
+++ /dev/null
@@ -1,5 +0,0 @@
-<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
-<h2><spring:message code="about.title"/></h2>
-<p>
-<spring:message code="about.body"/>
-</p>
\ No newline at end of file
diff --git a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/contactContent.tag b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/contactContent.tag
deleted file mode 100644
index 4f978c4d3..000000000
--- a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/contactContent.tag
+++ /dev/null
@@ -1,5 +0,0 @@
-<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
-<h2><spring:message code="contact.title"/></h2>
-<p>
-<spring:message code="contact.body"/>
-</p>
diff --git a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/statsContent.tag b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/statsContent.tag
deleted file mode 100644
index 9e529ff68..000000000
--- a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/statsContent.tag
+++ /dev/null
@@ -1,8 +0,0 @@
-<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
-<h2><spring:message code="statistics.title"/></h2>
-
-<p>
-    <spring:message code="statistics.number_users" arguments='${statsSummary["userCount"]}'/>
-    <spring:message code="statistics.number_clients" arguments='${statsSummary["clientCount"]}'/>
-    <spring:message code="statistics.number_approvals" arguments='${statsSummary["approvalCount"]}'/>
-</p>
diff --git a/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/about.jsp b/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/about.jsp
index 2661f2b3e..1bf74f8b5 100644
--- a/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/about.jsp
+++ b/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/about.jsp
@@ -15,7 +15,10 @@
 			<!-- Main hero unit for a primary marketing message or call to action -->
 			<div class="hero-unit">
 
-				<o:aboutContent />
+				<h2><spring:message code="about.title"/></h2>
+				<p>
+				<spring:message code="about.body"/>
+				</p>
 
 			</div>
 
diff --git a/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/contact.jsp b/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/contact.jsp
index 4e285f28d..cdfcdbcd1 100644
--- a/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/contact.jsp
+++ b/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/contact.jsp
@@ -15,7 +15,10 @@
 		<div class="span10">
 			<div class="hero-unit">
 
-				<o:contactContent />
+				<h2><spring:message code="contact.title"/></h2>
+				<p>
+				<spring:message code="contact.body"/>
+				</p>
 
 			</div>
 
diff --git a/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/stats.jsp b/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/stats.jsp
index 16b75ca42..8e97e6b36 100644
--- a/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/stats.jsp
+++ b/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/stats.jsp
@@ -14,7 +14,13 @@
         <o:sidebar/>
         <div class="span10">
             <div class="hero-unit">
-				<o:statsContent/>
+				<h2><spring:message code="statistics.title"/></h2>
+				
+				<p>
+				    <spring:message code="statistics.number_users" arguments='${statsSummary["userCount"]}'/>
+				    <spring:message code="statistics.number_clients" arguments='${statsSummary["clientCount"]}'/>
+				    <spring:message code="statistics.number_approvals" arguments='${statsSummary["approvalCount"]}'/>
+				</p>
             </div>
         </div>
     </div>
diff --git a/openid-connect-server-webapp/src/main/webapp/resources/static_resources_go_here b/openid-connect-server-webapp/src/main/webapp/resources/static_resources_go_here
deleted file mode 100644
index e69de29bb..000000000