diff --git a/source/web/WEB-INF/web.xml b/source/web/WEB-INF/web.xml
index c54e3adf2c..5f8ffa3721 100644
--- a/source/web/WEB-INF/web.xml
+++ b/source/web/WEB-INF/web.xml
@@ -65,17 +65,12 @@
         </description>
     </context-param>
 
-   <!-- Spring Application Context location and context class -->
+   <!-- Spring Application Context location -->
    <context-param>
       <param-name>contextConfigLocation</param-name>
       <param-value>/WEB-INF/web-application-context.xml</param-value>
       <description>Spring config file location</description>
    </context-param>
-   <context-param>
-      <param-name>contextClass</param-name>
-      <param-value>org.alfresco.config.JBossEnabledWebApplicationContext</param-value>
-      <description>Spring context class</description>
-   </context-param>
    
    <context-param>
       <param-name>log4jExposeWebAppRoot</param-name>
@@ -152,6 +147,17 @@
       <filter-name>Admin Authentication Filter</filter-name>
       <filter-class>org.alfresco.web.app.servlet.AdminAuthenticationFilter</filter-class>
    </filter>
+   
+   <filter>
+      <filter-name>CacheExpiresFilter</filter-name>
+      <description>Set HTTP cache Expires header 30 days forward for a mapping.</description>
+      <filter-class>org.alfresco.web.scripts.servlet.StaticAssetCacheFilter</filter-class>
+      <init-param>
+         <param-name>expires</param-name>
+         <param-value>30</param-value>
+         <description>Add an Expires Header 30 days forward</description>
+      </init-param>
+   </filter>
 
    <filter-mapping>
       <filter-name>Global Authentication Filter</filter-name>
@@ -253,17 +259,6 @@
       <url-pattern>/faces/jsp/admin/system-info.jsp</url-pattern>
    </filter-mapping>
    
-   <filter>
-      <description>Set HTTP cache Expires header 30 days forward for a mapping.</description>
-      <filter-name>CacheExpiresFilter</filter-name>
-      <filter-class>org.alfresco.web.scripts.servlet.StaticAssetCacheFilter</filter-class>
-      <init-param>
-         <description>Add an Expires Header 30 days forward</description>
-         <param-name>expires</param-name>
-         <param-value>30</param-value>
-      </init-param>
-   </filter>
-   
    <filter-mapping>
       <filter-name>CacheExpiresFilter</filter-name>
       <url-pattern>*.jpg</url-pattern>