diff --git a/project.properties b/project.properties
index 7e67da7136..5a5cf914a5 100644
--- a/project.properties
+++ b/project.properties
@@ -1,4 +1,4 @@
 webinf.delete.tomcat=jboss*.xml,portlet*.xml,alfresco-pages.xml
-webinf.lib.delete.jboss=log4j-1.2.8.jar,portlet-api-lib.jar
+webinf.lib.delete.jboss=log4j-1.2.8.jar,portlet-api-lib.jar,myfaces-api.jar,myfaces-impl.jar
 
 files.faces.config=/WEB-INF/faces-config-navigation.xml,/WEB-INF/faces-config-common.xml,/WEB-INF/faces-config-repo.xml,/WEB-INF/faces-config-zoo.xml
diff --git a/source/java/org/alfresco/web/app/Application.java b/source/java/org/alfresco/web/app/Application.java
index ff05b39b55..fc89f49d50 100644
--- a/source/java/org/alfresco/web/app/Application.java
+++ b/source/java/org/alfresco/web/app/Application.java
@@ -60,7 +60,7 @@ public class Application
    
    public static final String MESSAGE_BUNDLE = "alfresco.messages.webclient";
    
-   private static boolean inPortalServer = true;
+   private static boolean inPortalServer = false;
    private static StoreRef repoStoreRef;
    private static String rootPath;
    private static String companyRootId;
diff --git a/source/java/org/alfresco/web/app/portlet/AlfrescoFacesPortlet.java b/source/java/org/alfresco/web/app/portlet/AlfrescoFacesPortlet.java
index 013c2cf07f..10df8f9b77 100644
--- a/source/java/org/alfresco/web/app/portlet/AlfrescoFacesPortlet.java
+++ b/source/java/org/alfresco/web/app/portlet/AlfrescoFacesPortlet.java
@@ -60,9 +60,7 @@ import org.springframework.web.context.WebApplicationContext;
 public class AlfrescoFacesPortlet extends MyFacesGenericPortlet
 {
    public static final String INSTANCE_NAME = "AlfrescoClientInstance";
-   public static final String WINDOW_NAME = "AlfrescoClientWindow";
-   public static final String MANAGED_BEAN_PREFIX = "javax.portlet.p." + INSTANCE_NAME + 
-                                                    "." + WINDOW_NAME + "?";
+   public static final String MANAGED_BEAN_PREFIX = "javax.portlet.p." + INSTANCE_NAME + "?";
    
    private static final String ERROR_PAGE_PARAM = "error-page";
    private static final String ERROR_OCCURRED = "error-occurred";
diff --git a/source/web/WEB-INF/alfresco-object.xml b/source/web/WEB-INF/alfresco-object.xml
new file mode 100644
index 0000000000..fec5ff7a1f
--- /dev/null
+++ b/source/web/WEB-INF/alfresco-object.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployments>
+   <deployment>
+      <if-exists>overwrite</if-exists>
+      <parent-ref>default</parent-ref>
+      <properties/>
+      <page>
+         <page-name>Alfresco</page-name>
+         <properties/>
+         <window>
+            <window-name>AlfrescoClientWindow</window-name>
+            <instance-ref>AlfrescoClientInstance</instance-ref>
+            <default>true</default>
+            <region>center</region>
+            <height>0</height>
+         </window>
+      </page>
+   </deployment>
+   <deployment>
+      <if-exists>overwrite</if-exists>
+      <instance>
+         <instance-name>AlfrescoClientInstance</instance-name>
+         <component-ref>alfresco.AlfrescoClient</component-ref>
+      </instance>
+   </deployment>
+</deployments>
diff --git a/source/web/WEB-INF/alfresco-pages.xml b/source/web/WEB-INF/alfresco-pages.xml
deleted file mode 100644
index abc9efd5c4..0000000000
--- a/source/web/WEB-INF/alfresco-pages.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<pages>
-   <portal-name>default</portal-name>
-   <page>
-      <page-name>Alfresco</page-name>
-      <window>
-         <window-name>AlfrescoClientWindow</window-name>
-         <instance-ref>/alfresco.AlfrescoClient.AlfrescoClientInstance</instance-ref>
-         <default>true</default>
-         <region>center</region>
-         <height>0</height>
-      </window>
-   </page>
-</pages>
diff --git a/source/web/WEB-INF/jboss-app.xml b/source/web/WEB-INF/jboss-app.xml
new file mode 100644
index 0000000000..eac8510c4f
--- /dev/null
+++ b/source/web/WEB-INF/jboss-app.xml
@@ -0,0 +1,3 @@
+<jboss-app>
+   <app-name>alfresco</app-name>
+</jboss-app>
\ No newline at end of file
diff --git a/source/web/WEB-INF/jboss-service.xml b/source/web/WEB-INF/jboss-service.xml
deleted file mode 100644
index f982fc0d08..0000000000
--- a/source/web/WEB-INF/jboss-service.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<server>
-</server>
diff --git a/source/web/WEB-INF/portlet-instances.xml b/source/web/WEB-INF/portlet-instances.xml
deleted file mode 100644
index 7dc3f1b891..0000000000
--- a/source/web/WEB-INF/portlet-instances.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" standalone="yes"?>
-<instances>
-   <instance>
-      <instance-name>AlfrescoClientInstance</instance-name>
-      <component-ref>AlfrescoClient</component-ref>
-   </instance>
-</instances>
diff --git a/source/web/WEB-INF/portlet.xml b/source/web/WEB-INF/portlet.xml
index f98624315c..e7f70dae3e 100644
--- a/source/web/WEB-INF/portlet.xml
+++ b/source/web/WEB-INF/portlet.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd">
     <portlet>
         <description>Alfresco Client Portlet</description>
         <portlet-name>AlfrescoClient</portlet-name>
-        <display-name>Alfresco Portlet</display-name>
         <portlet-class>org.alfresco.web.app.portlet.AlfrescoFacesPortlet</portlet-class>
         
         <init-param>
diff --git a/source/web/WEB-INF/web_TEMPLATE.xml b/source/web/WEB-INF/web_TEMPLATE.xml
index 501424bbd4..6b94a0b59a 100644
--- a/source/web/WEB-INF/web_TEMPLATE.xml
+++ b/source/web/WEB-INF/web_TEMPLATE.xml
@@ -82,11 +82,6 @@
       -->
    </filter>
 
-   <filter>
-      <filter-name>Mode Detection Filter</filter-name>
-      <filter-class>org.alfresco.web.app.servlet.ModeDetectionFilter</filter-class>
-   </filter>
-
    <filter>
       <filter-name>WebDAV Authentication Filter</filter-name>
       <filter-class>org.alfresco.repo.webdav.auth.AuthenticationFilter</filter-class>
@@ -111,11 +106,6 @@
       <url-pattern>/navigate/*</url-pattern>
    </filter-mapping>
    -->
-         
-   <filter-mapping>
-      <filter-name>Mode Detection Filter</filter-name>
-      <url-pattern>/faces/*</url-pattern>
-   </filter-mapping>
    
    <filter-mapping>
       <filter-name>WebDAV Authentication Filter</filter-name>