diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml
index f6bcf18b..c6e02b96 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml
@@ -22,10 +22,11 @@
        For more available properties see the alfresco-sdk-parent POM.
        -->
     <properties>
-        <!-- The following are default values for data location and Alfresco version.
-             Uncomment if you need to change
-          <alfresco.version>${alfresco.community.default.version}</alfresco.version>
-          <alfresco.data.location>${alfresco.data.location}</alfresco.data.location> -->
+        <!-- The following are default values for data location, Alfresco Community version, and Records Management Module version.
+             Uncomment if you need to change (Note. current default version for Enterprise edition is 5.0.0.5)
+          <alfresco.version>5.0.d</alfresco.version>
+          <alfresco.rm.version>2.3</alfresco.rm.version>
+          <alfresco.data.location>alf_data_dev</alfresco.data.location> -->
 
         <!-- This control the root logging level for all apps uncomment and change, defaults to WARN
             <app.log.root.level>WARN</app.log.root.level>
@@ -65,11 +66,11 @@
         </plugins>
     </build>
 
-    <!-- Invoke your build with -Prun to run the multimodule project and enable rapid dev mode in your IDE.
-         See 'run' profile in the sub modules pom.xml for further behavioral details.
-     -->
     <profiles>
         <profile>
+            <!-- Invoke your build with -Prun to run the multimodule project and enable rapid dev mode in your IDE.
+                 See 'run' profile in the sub modules pom.xml for further behavioral details.
+             -->
             <id>run</id>
             <properties>
                 <!-- While running in rapid dev mode with -Prun, we don't want amp web resources 
@@ -78,15 +79,5 @@
                 <maven.alfresco.includeWebResources>false</maven.alfresco.includeWebResources>
             </properties>
         </profile>
-        <!-- RM profile, manually activated, automatically adds support for RM development (dependencies) and install the RM amps in the WARs -->
-        <profile>
-            <id>rm</id>
-            <properties>
-                <alfresco.rm.version>2.3.a.1</alfresco.rm.version>
-                <app.rm.amps.location>${project.build.directory}/rm-amps</app.rm.amps.location>
-                <app.rm.war.location>${project.build.directory}/${project.build.finalName}.war</app.rm.war.location>
-                <app.rm.artifact>org.alfresco:${alfresco.rm.artifactId}:${alfresco.rm.version}:amp</app.rm.artifact>
-            </properties>
-        </profile>
     </profiles>
 </project>
\ No newline at end of file
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/pom.xml
index 7d67d6e8..b93356ba 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/pom.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/pom.xml
@@ -24,6 +24,16 @@
             <groupId>${alfresco.groupId}</groupId>
             <artifactId>alfresco-repository</artifactId>
         </dependency>
+
+        <!-- Uncomment if you are using RM (Records Management) module, brings in RM related classes -->
+        <!--
+        <dependency>
+            <groupId>${alfresco.groupId}</groupId>
+            <artifactId>alfresco-rm</artifactId>
+            <version>${alfresco.rm.version}</version>
+            <classifier>classes</classifier>
+        </dependency>
+        -->
     </dependencies>
 
     <profiles>
@@ -43,22 +53,7 @@
             </dependencies>
         </profile>
 
-        <!-- RM profile, manually activated, automatically adds support for RM development
-             (dependencies) and install the RM amps in the WARs -->
-        <profile>
-            <id>rm</id>
-            <dependencies>
-                <dependency>
-                    <groupId>${alfresco.groupId}</groupId>
-                    <artifactId>alfresco-rm</artifactId>
-                    <version>${alfresco.rm.version}</version>
-                    <type>jar</type>
-                    <classifier>classes</classifier>
-                </dependency>
-            </dependencies>
-        </profile>
-
-        <!-- If we are running embedded skip unit tests -->
+        <!-- If we are running in embedded Tomcat skip unit tests -->
         <profile>
             <id>run</id>
             <properties>
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo/pom.xml
index 0b389c4b..0751a1c7 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo/pom.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo/pom.xml
@@ -38,7 +38,7 @@
             <version>${project.version}</version>
             <type>amp</type>
         </dependency>
-        <!-- Demonstrating the usage of a well known GA AMP (SharePoint Protocol Support) -->
+        <!-- Uncomment if you are using SPP (SharePoint Protocol Support) for Online Edit etc -->
         <!--
         <dependency>
             <groupId>${alfresco.groupId}</groupId>
@@ -47,6 +47,15 @@
             <type>amp</type>
         </dependency>
         -->
+        <!-- Uncomment if you are using the RM (Records Management) module. -->
+        <!--
+        <dependency>
+            <groupId>${alfresco.groupId}</groupId>
+            <artifactId>alfresco-rm</artifactId>
+            <version>${alfresco.rm.version}</version>
+            <type>amp</type>
+        </dependency>
+        -->
     </dependencies>
 
     <build>
@@ -77,6 +86,7 @@
                             <artifactId>repo-amp</artifactId>
                             <type>amp</type>
                         </overlay>
+                        <!-- Uncomment if you are using SPP -->
                         <!--
                         <overlay>
                             <groupId>${alfresco.groupId}</groupId>
@@ -84,11 +94,20 @@
                             <type>amp</type>
                         </overlay>
                         -->
+                        <!-- Uncomment if you are using RM -->
+                        <!--
+                        <overlay>
+                            <groupId>${alfresco.groupId}</groupId>
+                            <artifactId>alfresco-rm</artifactId>
+                            <type>amp</type>
+                        </overlay>
+                        -->
                     </overlays>
                 </configuration>
             </plugin>
         </plugins>
     </build>
+
     <profiles>
         <!-- Overrides the run profile to disable securecomms and add rapid development configuration -->
         <profile>
@@ -153,52 +172,5 @@
                 </dependency>
             </dependencies>
         </profile>
-        <!-- Installs the needed runtime artifact for an RM (Records Management) project -->
-        <profile>
-            <id>rm</id>
-             <properties>
-                <alfresco.rm.artifactId>alfresco-rm</alfresco.rm.artifactId>
-            </properties>
-            <build>
-                <plugins>
-                    <!-- Fetch Alfresco RM repo AMP -->
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-dependency-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>get-rm-repo</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>copy</goal>
-                                </goals>
-                                <configuration>
-                                    <artifact>${app.rm.artifact}</artifact>
-                                    <outputDirectory>${app.rm.amps.location}</outputDirectory>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <!-- The current AMP artifact is installed into the Alfresco folder using alfresco-maven-plugin -->
-                    <plugin>
-                        <groupId>org.alfresco.maven.plugin</groupId>
-                        <artifactId>alfresco-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>install-rm-repo</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>install</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <configuration>
-                            <ampLocation>${app.rm.amps.location}</ampLocation>
-                            <warLocation>${app.rm.war.location}</warLocation>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
     </profiles>
 </project>
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 f27a7fc2..6f816fc3 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
@@ -27,6 +27,15 @@
             <version>${project.version}</version>
             <type>amp</type>
         </dependency>
+        <!-- Uncomment if you are using RM (Records Management) module -->
+        <!--
+        <dependency>
+            <groupId>${alfresco.groupId}</groupId>
+            <artifactId>alfresco-rm-share</artifactId>
+            <version>${alfresco.rm.version}</version>
+            <type>amp</type>
+        </dependency>
+        -->
     </dependencies>
 
     <build>
@@ -57,59 +66,17 @@
                             <artifactId>share-amp</artifactId>
                             <type>amp</type>
                         </overlay>
+                        <!-- Uncomment if you are using RM module -->
+                        <!--
+                        <overlay>
+                            <groupId>${alfresco.groupId}</groupId>
+                            <artifactId>alfresco-rm-share</artifactId>
+                            <type>amp</type>
+                        </overlay>
+                        -->
                     </overlays>
                 </configuration>
             </plugin>
         </plugins>
     </build>
-
-    <profiles>
-    	<!-- Installs the needed runtime component for an Alfresco RM (Records Management) project -->
-        <profile>
-            <id>rm</id>
-             <properties>
-                <alfresco.rm.artifactId>alfresco-rm-share</alfresco.rm.artifactId>
-            </properties>
-            <build>
-                <plugins>
-                    <!-- Fetch Alfresco RM repo AMP -->
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-dependency-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>get-rm-share</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>copy</goal>
-                                </goals>
-                                <configuration>
-                                    <artifact>${app.rm.artifact}</artifact>
-                                    <outputDirectory>${app.rm.amps.location}</outputDirectory>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <!-- The current AMP artifact is installed into the Alfresco folder using alfresco-maven-plugin -->
-                    <plugin>
-                        <groupId>org.alfresco.maven.plugin</groupId>
-                        <artifactId>alfresco-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>install-rm-share</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>install</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <configuration>
-                            <ampLocation>${app.rm.amps.location}</ampLocation>
-                            <warLocation>${app.rm.war.location}</warLocation>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/test/resources/alfresco/web-extension/share-config-custom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/test/resources/alfresco/web-extension/share-config-custom.xml
index 01b78708..35458c18 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/test/resources/alfresco/web-extension/share-config-custom.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/test/resources/alfresco/web-extension/share-config-custom.xml
@@ -3,9 +3,9 @@
     <config evaluator="string-compare" condition="WebFramework">
         <web-framework>
             <autowire>
-                <!-- Changing this to 'development' currently breaks the Admin Console so it does not work correctly.
-                     During testing we instead disable JS compilation by overriding bean javaScriptProcessor -->
-                <mode>production</mode>
+                <!-- Changing this to 'development' currently breaks the Admin Console.
+                     Instead we make a POST to clear Share dependency caches, see 'clear-caches-refresh-ws' profile. -->
+                <mode>production</mode> <!-- not really need in the long run, used for YUI - deprecate -->
             </autowire>
 
             <!--
diff --git a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml
index 479a535f..3fb54d35 100644
--- a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml
@@ -21,10 +21,10 @@
         For more available properties see the alfresco-sdk-parent POM.
        -->
     <properties>
-        <!-- The following are default values for data location and Alfresco version.
-             Uncomment if you need to change
-          <alfresco.version>${alfresco.community.default.version}</alfresco.version>
-          <alfresco.data.location>${alfresco.data.location}</alfresco.data.location> -->
+        <!-- The following are default values for data location and Alfresco Community version.
+             Uncomment if you need to change (Note. current default version for Enterprise edition is 5.0.0.5)
+          <alfresco.version>5.0.d</alfresco.version>
+          <alfresco.data.location>alf_data_dev</alfresco.data.location> -->
 
         <!-- This control the root logging level for all apps uncomment and change, defaults to WARN
             <app.log.root.level>WARN</app.log.root.level>
diff --git a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/test/resources/alfresco/web-extension/share-config-custom.xml b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/test/resources/alfresco/web-extension/share-config-custom.xml
index b27972ca..aa14b0a8 100644
--- a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/test/resources/alfresco/web-extension/share-config-custom.xml
+++ b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/test/resources/alfresco/web-extension/share-config-custom.xml
@@ -1,22 +1,21 @@
 <alfresco-config>
 
-      <config evaluator="string-compare" condition="WebFramework">
-           <web-framework>
-               <autowire>
-                   <!-- Changing this to 'development' currently breaks the Admin Console so it does not work correctly.
-                        During testing we instead disable JS compilation by overriding bean javaScriptProcessor -->
-                   <mode>production</mode>
-               </autowire>
-
-               <!--
-                    If resource caching has been disabled then all the dependency caches will be cleared
-                    before processing the Aikau jsonModel request...
-                       (i.e. this.dojoDependencyHandler.clearCaches() )
-               -->
-               <disable-resource-caching>true</disable-resource-caching>
-           </web-framework>
-       </config>
+    <config evaluator="string-compare" condition="WebFramework">
+        <web-framework>
+            <autowire>
+                <!-- Changing this to 'development' currently breaks the Admin Console.
+                     Instead we make a POST to clear Share dependency caches, see 'clear-caches-refresh-ws' profile. -->
+                <mode>production</mode> <!-- not really need in the long run, used for YUI - deprecate -->
+            </autowire>
 
+            <!--
+                 If resource caching has been disabled then all the dependency caches will be cleared
+                 before processing the Aikau jsonModel request...
+                    (i.e. this.dojoDependencyHandler.clearCaches() )
+            -->
+            <disable-resource-caching>true</disable-resource-caching>
+        </web-framework>
+    </config>
 
     <!-- Global config section -->
     <config replace="true">
diff --git a/pom.xml b/pom.xml
index a304f3ef..c76eb959 100644
--- a/pom.xml
+++ b/pom.xml
@@ -135,6 +135,7 @@
         <alfresco.sdk.parent.version>${project.version}</alfresco.sdk.parent.version>
         <alfresco.community.default.version>5.0.d</alfresco.community.default.version>
         <alfresco.enterprise.default.version>5.0.0.5</alfresco.enterprise.default.version>
+        <alfresco.rm.version>2.3</alfresco.rm.version>
         <springloaded.version>1.2.3.RELEASE</springloaded.version>
         <scm.url.base>https://github.com/Alfresco/alfresco-sdk</scm.url.base>
     </properties>