diff --git a/amps/ags/README.md b/amps/ags/README.md
index 3f952da331..5a321152ab 100644
--- a/amps/ags/README.md
+++ b/amps/ags/README.md
@@ -163,19 +163,6 @@ mvn clean install -DskipTests -Dalfresco.aikau.version=LATEST -U
 
 Thereafter start the Share instance and run automation tests as described above.
 
-## Configuring Outlook Integration
-To download and run RM with the Outlook Integration AMPs installed on the repo and Share use the following commands:
-
-```
-mvn clean install -Pstart-repo,outlook-integration
-mvn clean install -Pstart-share,outlook-integration
-```
-
-Follow these instructions to install licence and Outlook plugin:
-
-* http://docs.alfresco.com/outlook2.1/tasks/Outlook-license.html
-* http://docs.alfresco.com/outlook2.1/tasks/Outlook-install_v2.html
-
 ## SNAPSHOT dependencies
 If you're building Enterprise RM, the base project (Community) is pulled in via a snapshot dependency configured in maven.
 This dependency will either be loaded from your local .m2 cache, or from Nexus if the version in your .m2 doesn't exist or is old
diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml
index 8bfa7f0618..af43179048 100644
--- a/amps/ags/pom.xml
+++ b/amps/ags/pom.xml
@@ -26,8 +26,8 @@
       <alfresco.db.username>alfresco</alfresco.db.username>
       <alfresco-spring-webscripts.version>8.15</alfresco-spring-webscripts.version>
       <api.explorer.version>7.0.0</api.explorer.version>
-      <!-- Set this here and override it in the community and enterprise modules. -->
-      <alfresco.min.version>0.0</alfresco.min.version>
+
+      <alfresco.min.version>7.0.0</alfresco.min.version>
 
       <activemq.port1>61616</activemq.port1>
       <activemq.port2>5672</activemq.port2>
@@ -129,6 +129,7 @@
          <groupId>org.apache.camel</groupId>
          <artifactId>camel-mock</artifactId>
          <version>${camel.mock.version}</version>
+         <scope>test</scope>
       </dependency>
 
       <dependency>
diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml
index bb3d57b624..a83000e57a 100644
--- a/amps/ags/rm-community/pom.xml
+++ b/amps/ags/rm-community/pom.xml
@@ -15,12 +15,6 @@
       <module>rm-community-repo</module>
    </modules>
 
-   <properties>
-      <spring.version>5.3.3</spring.version>
-      <alfresco.min.version>7.0.0</alfresco.min.version>
-      <app.filtering.enabled>true</app.filtering.enabled>
-   </properties>
-
    <licenses>
       <license>
          <name>LGPL 3</name>
@@ -29,17 +23,10 @@
 
    <dependencyManagement>
       <dependencies>
-         <dependency>
-            <groupId>org.alfresco</groupId>
-            <artifactId>alfresco-community-repo</artifactId>
-            <version>${project.version}</version>
-            <type>pom</type>
-            <scope>import</scope>
-         </dependency>
          <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
-            <version>${spring.version}</version>
+            <version>${dependency.spring.version}</version>
          </dependency>
          <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml
index 1da191248d..45c6794b3a 100644
--- a/amps/ags/rm-community/rm-community-repo/pom.xml
+++ b/amps/ags/rm-community/rm-community-repo/pom.xml
@@ -30,7 +30,6 @@
 
       <alfresco.repo.artifactId>alfresco-platform</alfresco.repo.artifactId>
       <alfresco.postgres.version>9.1-901.jdbc4</alfresco.postgres.version>
-      <ags.artifactId>alfresco-governance-services-community-repo</ags.artifactId>
 
       <image.name>alfresco/alfresco-governance-repository-community</image.name>
 
@@ -617,160 +616,6 @@
          </build>
       </profile>
 
-      <profile>
-         <id>start-repo</id>
-         <build>
-            <plugins>
-               <plugin>
-                  <groupId>org.apache.maven.plugins</groupId>
-                  <artifactId>maven-dependency-plugin</artifactId>
-                  <executions>
-                     <execution>
-                        <id>unpack-alfresco</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                           <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                           <outputDirectory>${app.amp.client.war.folder}</outputDirectory>
-                           <artifactItems>
-                              <artifactItem>
-                                 <groupId>org.alfresco</groupId>
-                                 <artifactId>content-services-community</artifactId>
-                                 <type>war</type>
-                                 <version>${project.version}</version>
-                              </artifactItem>
-                           </artifactItems>
-                        </configuration>
-                     </execution>
-                  </executions>
-               </plugin>
-               <plugin>
-                  <groupId>org.alfresco.maven.plugin</groupId>
-                  <artifactId>alfresco-maven-plugin</artifactId>
-                  <executions>
-                     <execution>
-                        <id>amps-to-war-overlay</id>
-                        <phase>package</phase>
-                        <goals>
-                           <goal>install</goal>
-                        </goals>
-                     </execution>
-                  </executions>
-                  <configuration>
-                     <includeWebResources>false</includeWebResources>
-                  </configuration>
-               </plugin>
-               <plugin>
-                  <groupId>org.apache.tomcat.maven</groupId>
-                  <artifactId>tomcat7-maven-plugin</artifactId>
-                  <executions>
-                     <execution>
-                        <id>run-embedded</id>
-                        <goals>
-                           <goal>run</goal>
-                        </goals>
-                        <phase>integration-test</phase>
-                        <configuration>
-                           <useTestClasspath>false</useTestClasspath>
-                           <ignorePackaging>true</ignorePackaging>
-                           <useSeparateTomcatClassLoader>true</useSeparateTomcatClassLoader>
-                           <systemProperties>
-                              <java.io.tmpdir>${project.build.directory}</java.io.tmpdir>
-                           </systemProperties>
-                           <delegate>false</delegate>
-                           <contextFile>${project.basedir}/tomcat/context.xml</contextFile>
-                           <webapps>
-                              <webapp>
-                                 <groupId>org.alfresco</groupId>
-                                 <artifactId>api-explorer</artifactId>
-                                 <version>${api.explorer.version}</version>
-                                 <contextPath>/api-explorer</contextPath>
-                                 <type>war</type>
-                                 <asWebapp>true</asWebapp>
-                              </webapp>
-                              <webapp>
-                                 <groupId>org.alfresco</groupId>
-                                 <artifactId>alfresco-governance-services-community-rest-api-explorer</artifactId>
-                                 <version>${project.version}</version>
-                                 <contextPath>/gs-api-explorer</contextPath>
-                                 <type>war</type>
-                                 <asWebapp>true</asWebapp>
-                              </webapp>
-                           </webapps>
-                        </configuration>
-                     </execution>
-                  </executions>
-                  <dependencies>
-                     <dependency>
-                        <groupId>postgresql</groupId>
-                        <artifactId>postgresql</artifactId>
-                        <version>${alfresco.postgres.version}</version>
-                     </dependency>
-                     <dependency>
-                        <groupId>mysql</groupId>
-                        <artifactId>mysql-connector-java</artifactId>
-                        <version>${dependency.mysql.version}</version>
-                     </dependency>
-                  </dependencies>
-               </plugin>
-            </plugins>
-         </build>
-      </profile>
-
-      <profile>
-         <id>wipeDB</id>
-         <build>
-            <plugins>
-               <plugin>
-                  <groupId>org.codehaus.mojo</groupId>
-                  <artifactId>sql-maven-plugin</artifactId>
-                  <configuration>
-                     <autocommit>true</autocommit>
-                     <driver>${alfresco.db.datasource.class}</driver>
-                     <url>${alfresco.db.master.url}</url>
-                     <username>${alfresco.db.username}</username>
-                     <password>${alfresco.db.password}</password>
-                  </configuration>
-                  <dependencies>
-                     <dependency>
-                        <groupId>postgresql</groupId>
-                        <artifactId>postgresql</artifactId>
-                        <version>${alfresco.postgres.version}</version>
-                     </dependency>
-                     <dependency>
-                        <groupId>mysql</groupId>
-                        <artifactId>mysql-connector-java</artifactId>
-                        <version>${dependency.mysql.version}</version>
-                     </dependency>
-                  </dependencies>
-                  <executions>
-                     <execution>
-                        <id>wipe-database</id>
-                        <phase>process-test-resources</phase>
-                        <goals>
-                           <goal>execute</goal>
-                        </goals>
-                        <configuration>
-                           <sqlCommand>drop database if exists alfresco</sqlCommand>
-                        </configuration>
-                     </execution>
-                     <execution>
-                        <id>create-database</id>
-                        <phase>process-test-resources</phase>
-                        <goals>
-                           <goal>execute</goal>
-                        </goals>
-                        <configuration>
-                           <sqlCommand>create database alfresco</sqlCommand>
-                        </configuration>
-                     </execution>
-                  </executions>
-               </plugin>
-            </plugins>
-         </build>
-      </profile>
-
        <profile>
           <!-- builds "image:latest" locally -->
           <id>communityDocker</id>