diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
index 54f4bbee..4be0dcb5 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -10,7 +10,7 @@
       <defaultValue>org.alfresco</defaultValue>
     </requiredProperty>
     <requiredProperty key="alfresco_target_version">
-      <defaultValue>4.2.c</defaultValue>
+      <defaultValue>4.2.e</defaultValue>
     </requiredProperty>
     <requiredProperty key="package">
       <defaultValue>(not used)</defaultValue>
@@ -118,28 +118,6 @@
         </fileSet>
       </fileSets>
     </module>
-    <module id="wcmqs" dir="wcmqs" name="share" filtered="false">
-      <fileSets>
-        <fileSet encoding="UTF-8">
-          <directory>src/main/webapp</directory>
-          <includes>
-            <include>**</include>
-          </includes>
-        </fileSet>
-        <fileSet encoding="UTF-8" filtered="false">
-          <directory>src/main/resources</directory>
-          <includes>
-            <include>**</include>
-          </includes>
-        </fileSet>
-        <fileSet encoding="UTF-8" filtered="false">
-          <directory>src/main/webapp</directory>
-          <includes>
-            <include>**</include>
-          </includes>
-        </fileSet>
-      </fileSets>
-    </module>
     <module id="runner" dir="runner" name="runner" filtered="false">
       <fileSets>
         <fileSet encoding="UTF-8">
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/alfresco/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/alfresco/pom.xml
index 4b4d5912..d1555a43 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/alfresco/pom.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/alfresco/pom.xml
@@ -30,17 +30,17 @@
             <artifactId>alfresco</artifactId>
             <type>war</type>
         </dependency>
-        <!-- Demonstrating the dependency on the AMP developed in the 'amp' project -->
+        <!-- Demonstrating the dependency on the repo AMP developed in the 'amp' module -->
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>amp</artifactId>
             <version>${project.version}</version>
             <type>amp</type>
         </dependency>
-        <!-- Demonstrating the usage of a well known GA AMP (Web Quick Start Repository component) -->
+        <!-- Demonstrating the usage of a well known GA AMP (SharePoint Protocol Support) -->
         <dependency>
             <groupId>${alfresco.groupId}</groupId>
-            <artifactId>alfresco-wcm-quickstart-repo</artifactId>
+            <artifactId>alfresco-spp</artifactId>
             <version>${alfresco.version}</version>
             <type>amp</type>
         </dependency>
@@ -76,7 +76,7 @@
                         </overlay>
                         <overlay>
                             <groupId>${alfresco.groupId}</groupId>
-                            <artifactId>alfresco-wcm-quickstart-repo</artifactId>
+                            <artifactId>alfresco-spp</artifactId>
                             <type>amp</type>
                         </overlay>
                     </overlays>
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/amp/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/amp/pom.xml
index 1846c37b..73016462 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/amp/pom.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/amp/pom.xml
@@ -13,10 +13,8 @@
     </parent>
 
     <!--
-    Following dependencies are needed for compiling
-    Java code in src/main/java; <scope>provided</scope>
-    is inherited for each of the following; for more
-    info, please refer to alfresco-integration-parent
+    Following dependencies are needed for compiling Java code in src/main/java; <scope>provided</scope>
+    is inherited for each of the following; for more info, please refer to alfresco-integration-parent
     POM definition
     @TODO - document
     -->
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml
index f010a43e..b6b27c89 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml
@@ -56,10 +56,6 @@
                                     <war>${project.basedir}/../share/target/share.war</war>
                                     <contextPath>/share</contextPath>
                                 </contextHandler>
-                                <contextHandler implementation="org.mortbay.jetty.webapp.WebAppContext">
-                                    <war>${project.basedir}/../wcmqs/target/wcmqs.war</war>
-                                    <contextPath>/wcmqs</contextPath>
-                                </contextHandler>
                             </contextHandlers>
                             <systemProperties>
                                 <systemProperty>
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/pom.xml
index b18d90d9..bbed2534 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/pom.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/pom.xml
@@ -19,14 +19,8 @@
             <artifactId>share</artifactId>
             <type>war</type>
         </dependency>
-        <!-- Demonstrating the usage of a well known GA AMP (Web Quick Start 
-            Share component) -->
-        <dependency>
-            <groupId>${alfresco.groupId}</groupId>
-            <artifactId>alfresco-wcm-quickstart-share</artifactId>
-            <version>${alfresco.version}</version>
-            <type>amp</type>
-        </dependency>
+        <!-- Here you can add your Share AMP dependencies -->
+       
     </dependencies>
     <build>
         <plugins>
@@ -50,12 +44,7 @@
                             <!-- To allow inclusion of META-INF -->
                             <excludes/>
                         </overlay>
-                        <!-- Add / order your AMPs here -->
-                        <overlay>
-                            <groupId>${alfresco.groupId}</groupId>
-                            <artifactId>alfresco-wcm-quickstart-share</artifactId>
-                            <type>amp</type>
-                        </overlay>
+                        <!-- Add / order here the Share AMPs declared above -->
                     </overlays>
                 </configuration>
             </plugin>
diff --git a/archetypes/alfresco-amp-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/archetypes/alfresco-amp-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
index 398024b8..42c94780 100644
--- a/archetypes/alfresco-amp-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/archetypes/alfresco-amp-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -10,7 +10,7 @@
       <defaultValue>org.alfresco</defaultValue>
     </requiredProperty>
     <requiredProperty key="alfresco_target_version">
-      <defaultValue>4.2.c</defaultValue>
+      <defaultValue>4.2.e</defaultValue>
     </requiredProperty>
     <requiredProperty key="alfresco_target_amp_client_war">
       <defaultValue>alfresco</defaultValue>
@@ -19,7 +19,7 @@
       <defaultValue>org.alfresco</defaultValue>
     </requiredProperty>
     <requiredProperty key="alfresco_target_amp_client_war_version">
-      <defaultValue>4.2.c</defaultValue>
+      <defaultValue>4.2.e</defaultValue>
     </requiredProperty>
     <requiredProperty key="package">
       <defaultValue>(not used)</defaultValue>
diff --git a/plugins/alfresco-maven-plugin/pom.xml b/plugins/alfresco-maven-plugin/pom.xml
index fc3813c4..578d6b1e 100644
--- a/plugins/alfresco-maven-plugin/pom.xml
+++ b/plugins/alfresco-maven-plugin/pom.xml
@@ -84,7 +84,7 @@
     <dependency>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-mmt</artifactId>
-      <version>4.2.d-beta</version>
+      <version>4.2.e</version>
     </dependency>
   </dependencies>