diff --git a/README.txt b/README.txt
index 3f0c7af850..27ada2f806 100644
--- a/README.txt
+++ b/README.txt
@@ -25,7 +25,7 @@ Using Eclipse
 
 Summary of Available Ant Targets
 
- - configureSOLR                : Configures SOLR for Alfresco
+ - configureSolr                : Configures Solr for Alfresco
  - fullBuild                    : Creates the amp file and applies it to the war file
  - incrementalBuild             : Creates the jar file and copies the jar file with other files like css, js, ftl, etc. files
  - prepareEnv                   : Prepares the development environment (must be run just once)
@@ -42,7 +42,7 @@ Summary of Available Internal Ant Targets
  - copyWebDirectory             : Copies the source/web folder
  - deleteExplodedWar            : Deletes the exploded war file
  - deleteWarFile                : Deletes the war file
- - fetchSOLR                    : Gets the the SOLR artifact
+ - fetchSolr                    : Gets the the Solr artifact
  - fetchWarFile                 : Gets the "original" war file
  - install                      : Executes the "mvn install" command
  - package                      : Executes the "mvn package" command
diff --git a/pom.xml b/pom.xml
index 73ae6bd8aa..b6a3fa98f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,14 +82,9 @@
 
       <!-- Sonar specific properties -->
       <sonar.jacoco.reportPath>${project.build.directory}/jacoco.exec</sonar.jacoco.reportPath>
-
-      <!-- Bamboo build number and build key. These property values are empty. The values will be passed on bamboo configuration -->
-      <buildNumber></buildNumber>
-      <buildKey></buildKey>
    </properties>
 
    <build>
-      <finalName>${project.artifactId}-${project.version}${buildNumber}${buildKey}</finalName>
       <plugins>
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
diff --git a/rm-server/build.properties b/rm-server/build.properties
index 97f39da896..822952c94d 100644
--- a/rm-server/build.properties
+++ b/rm-server/build.properties
@@ -7,13 +7,12 @@ app.war.artifactId=alfresco
 # Tomcat folder name used by the alfresco application
 app.tomcat=tomcat
 
-# SOLR configuration
+# Solr configuration
 solr.directory=solr
 solr.artifactId=alfresco-solr
 solr.packaging=zip
 solr.package=${solr.artifactId}.${solr.packaging}
 
-
 # DB driver properties
 db.driver.groupId=postgresql
 db.driver.artifactId=${db.driver.groupId}
diff --git a/rm-server/build.xml b/rm-server/build.xml
index 0551112569..14109d68ef 100644
--- a/rm-server/build.xml
+++ b/rm-server/build.xml
@@ -33,7 +33,7 @@
       </exec>
    </target>
 
-   <target name="fetchSOLR">
+   <target name="fetchSolr">
       <xmlproperty file="../pom.xml" keepRoot="false"/>
       <exec executable="${mvn.exec}" failonerror="true">
          <arg value="dependency:get" />
@@ -46,8 +46,8 @@
       <unzip src="${solr.directory}/${solr.package}" dest="${solr.directory}"/>
    </target>
 
-   <target name="configureSOLR" depends="fetchSOLR" 
-           description="Configures Tomcat and the Alfresco repository to use SOLR">
+   <target name="configureSolr" depends="fetchSolr"
+           description="Configures Tomcat and the Alfresco repository to use Solr">
 
       <dirname property="temp.dir" file="${ant.file}"/>
       <pathconvert property="base.dir" targetos="unix">
@@ -59,7 +59,7 @@
 
       <mkdir dir="${data.root}/solr-index"/>
 
-      <!-- copy SOLR config files -->
+      <!-- copy Solr config files -->
       <copy file="${solr.directory}/context.xml"
             tofile="${app.tomcat.folder}/conf/Catalina/localhost/solr.xml" />
       <replace file="${app.tomcat.folder}/conf/Catalina/localhost/solr.xml" summary="yes">
@@ -85,20 +85,19 @@
          <replacetoken><![CDATA[<!-- Alfresco SSL Connector placeholder -->]]></replacetoken>
          <replacevalue><![CDATA[
             <Connector port="8443" protocol="org.apache.coyote.http11.Http11Protocol" SSLEnabled="true"
-                       maxThreads="150" scheme="https" keystoreFile="../../data/keystore/ssl.keystore" 
+                       maxThreads="150" scheme="https" keystoreFile="../../data/keystore/ssl.keystore"
                        keystorePass="kT9X6oe68t" keystoreType="JCEKS"
-                       secure="true" connectionTimeout="240000" 
-                       truststoreFile="../../data/keystore/ssl.truststore" 
+                       secure="true" connectionTimeout="240000"
+                       truststoreFile="../../data/keystore/ssl.truststore"
                        truststorePass="kT9X6oe68t" truststoreType="JCEKS"
                        clientAuth="want" sslProtocol="TLS" allowUnsafeLegacyRenegotiation="true" maxHttpHeaderSize="32768" />]]></replacevalue>
-       </replace>
+      </replace>
 
-      <!-- update project repository.properties file with SOLR properties -->
+      <!-- update project repository.properties file with Solr properties -->
       <propertyfile file="${data.root}/repository.properties">
          <entry key="dir.keystore" value="${data.root}/keystore" />
          <entry key="index.subsystem.name"  value="solr" />
       </propertyfile>
-
    </target>
 
 </project>
\ No newline at end of file
diff --git a/rm-server/pom.xml b/rm-server/pom.xml
index 09beb21fc7..5dc43e4252 100644
--- a/rm-server/pom.xml
+++ b/rm-server/pom.xml
@@ -27,7 +27,7 @@
          </testResource>
       </testResources>
       <plugins>
-      <!-- Additional source folder to be added: source/compatibility -->
+         <!-- Additional source folder to be added: source/compatibility -->
          <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>build-helper-maven-plugin</artifactId>
@@ -130,30 +130,6 @@
             </plugins>
          </build>
       </profile>
-      <profile>
-         <id>Alfresco42</id>
-         <!-- 'config' dependencies -->
-         <dependencies>
-            <dependency>
-               <groupId>org.alfresco</groupId>
-               <artifactId>alfresco-data-model</artifactId>
-               <version>${alfresco.base.version}</version>
-               <classifier>config</classifier>
-            </dependency>
-            <dependency>
-               <groupId>org.alfresco</groupId>
-               <artifactId>alfresco-repository</artifactId>
-               <version>${alfresco.base.version}</version>
-               <classifier>config</classifier>
-            </dependency>
-            <dependency>
-               <groupId>org.alfresco</groupId>
-               <artifactId>alfresco-remote-api</artifactId>
-               <version>${alfresco.base.version}</version>
-               <classifier>config</classifier>
-            </dependency>
-         </dependencies>
-      </profile>
       <profile>
          <id>fullBuild</id>
          <build>
@@ -193,11 +169,17 @@
             </plugins>
          </build>
       </profile>
+      <profile>
+         <id>enterprise</id>
+         <properties>
+            <webapp.id>alfresco-enterprise</webapp.id>
+         </properties>
+      </profile>
    </profiles>
    <dependencies>
       <dependency>
          <groupId>org.alfresco</groupId>
-         <artifactId>alfresco</artifactId>
+         <artifactId>${webapp.id}</artifactId>
          <version>${alfresco.base.version}</version>
          <type>war</type>
       </dependency>
@@ -221,11 +203,11 @@
          <scope>test</scope>
       </dependency>
       <dependency>
-	     <groupId>org.mockito</groupId>
-	     <artifactId>mockito-all</artifactId>
-	     <version>1.9.5</version>
+         <groupId>org.mockito</groupId>
+         <artifactId>mockito-all</artifactId>
+         <version>1.9.5</version>
          <scope>test</scope>
-	  </dependency>
+      </dependency>
       <dependency>
          <groupId>org.springframework</groupId>
          <artifactId>spring-test</artifactId>
@@ -246,18 +228,6 @@
          <classifier>tests</classifier>
          <scope>test</scope>
       </dependency>
-      <dependency>
-         <groupId>org.apache.chemistry</groupId>
-         <artifactId>chemistry-tck-atompub</artifactId>
-         <version>0.1-incubating-unreleased</version>
-         <scope>test</scope>
-      </dependency>
-      <dependency>
-         <groupId>org.apache.myfaces.core</groupId>
-         <artifactId>myfaces-api</artifactId>
-         <version>2.1.9</version>
-         <scope>test</scope>
-      </dependency>
       <!-- Database drivers -->
       <dependency>
          <groupId>postgresql</groupId>
@@ -284,11 +254,5 @@
          <version>3.0</version>
          <scope>test</scope>
       </dependency>
-      <!-- FIXME: Test do not run (NoClassDefFoundError: org/w3c/dom/ElementTraversal) -->
-      <dependency>
-         <groupId>xml-apis</groupId>
-         <artifactId>xml-apis</artifactId>
-         <version>1.4.01</version>
-      </dependency>
    </dependencies>
 </project>
\ No newline at end of file