diff --git a/config/alfresco/deployment/filesystem-target-sample.xml b/config/alfresco/deployment/filesystem-target-sample.xml
deleted file mode 100644
index 265cee4a19..0000000000
--- a/config/alfresco/deployment/filesystem-target-sample.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
-
-<!--  Built in deployment server target -->
-
-<!--  Sample file -->
-<!-- Copy to <TOMCAT HOME>/shared/alfresco/extension/deployment and rename to filesystem-target.xml (remove the -sample) -->
-
-<beans>
- 
-    <!--  This is the common configuration for all file system receivers -->
-    <bean id="fileSystemReceiverService" class="org.alfresco.deployment.impl.fsr.FileSystemReceiverServiceImpl"
-          init-method="init">
-          
-        <!-- Will an error be thrown if the FSR overwrites files outside its control -->
-        <property name="errorOnOverwrite"><value>${deployment.filesystem.errorOnOverwrite}</value></property>
-        
-        <!--  Where to store temporary data -->  
-        <property name="dataDirectory">
-            <value>${deployment.filesystem.datadir}</value>
-        </property>
-        
-        <!--  Where to log information -->
-        <property name="logDirectory">
-            <value>${deployment.filesystem.logdir}</value>
-        </property>
-        
-
-        
-        <property name="commandQueue"><ref bean="deploymentReceiverCommandQueue" /></property>      
-    </bean>
-    	
-	<!--  
-	
-	Defines and registers the deployment target with the name "default" 
-	Which is a FileSystemDeploymentTarget with the "deploymentReceiverEngine"
-	-->
-	
-	<bean class="org.alfresco.deployment.impl.server.DeploymentTargetRegistrationBean"
-		init-method="register" >
-		
-		<property name="name"><value>${deployment.filesystem.default.name}</value></property>
-		<property name="registry"><ref bean="deploymentReceiverEngine" /></property>
-		
-		<property name="target">
-		    <bean class="org.alfresco.deployment.impl.fsr.FileSystemDeploymentTarget" init-method="init">
-                	    <property name="rootDirectory"><value>${deployment.filesystem.default.rootdir}</value></property>
-            	    	
-            	    	 <!--  where to store meta data -->
-        				<property name="metaDataDirectory">
-            				<value>${deployment.filesystem.default.metadatadir}</value>
-        				</property>
-            	    	
-            	    	<property name="autoFix"><value>${deployment.filesystem.autofix}</value></property> 
-            	    	<property name="fileSystemReceiverService"><ref bean="fileSystemReceiverService"/></property> 
-            	    	
-            	    	<!--  how to authenticate for this particular target -->
-						<property name="authenticator">
-						<bean class="org.alfresco.repo.deploy.DeploymentReceiverAuthenticatorAuthenticationService"
-							init-method="init">
-							<property name="authenticationService">
-								<ref bean="AuthenticationService" />
-							</property>
-						</bean>
-						</property>
-            	    	
-        				<!-- Target Event Handlers
-        				<property name="prepare">
-                        	<list>
-     							<bean class="org.alfresco.deployment.SampleRunnable"/>
-                         	</list>
-                     	</property>
-                     	
-                     	<property name="postCommit">
-                        	<list>
-     							<bean class="org.alfresco.deployment.SampleRunnable"/>
-                         	</list>
-                     	</property>
-        				-->			
-    	    </bean>
-       </property>
-   </bean>
-    
-</beans>
\ No newline at end of file
diff --git a/config/alfresco/extension/deployment-attempt-cleaner-context.xml.sample b/config/alfresco/extension/deployment-attempt-cleaner-context.xml.sample
deleted file mode 100644
index 73c20e4439..0000000000
--- a/config/alfresco/extension/deployment-attempt-cleaner-context.xml.sample
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
-
-<!--
-Configuration of a scheduled job that, by default, at 4am removes any deployment attempt nodes
-that are older than 180 days.
--->
-
-<beans>
-   
-    <bean id="avmDeploymentAttemptCleaner" class="org.alfresco.repo.avm.AVMDeploymentAttemptCleaner">
-        <!-- number of days to keep deployment attempts -->
-        <property name="maxAge">
-            <value>180</value>
-        </property>
-        <property name="nodeService">
-            <ref bean="NodeService" />
-        </property>
-        <property name="transactionService">
-            <ref bean="TransactionService" />
-        </property>
-        <property name="searchService">
-            <ref bean="SearchService" />
-        </property>
-        <property name="importerBootstrap">
-            <ref bean="spacesBootstrap" />
-        </property>
-    </bean>
-    
-    <bean id="avmDeploymentAttemptCleanup" class="org.alfresco.util.CronTriggerBean">
-        <property name="jobDetail">
-            <bean id="avmDeploymentAttemptCleanerDetail" class="org.springframework.scheduling.quartz.JobDetailBean">
-                <property name="jobClass">
-                    <value>org.alfresco.repo.avm.AVMDeploymentAttemptCleanerJob</value>
-                </property>
-                <property name="jobDataAsMap">
-                    <map>
-                        <entry key="deploymentAttemptCleaner">
-                            <ref bean="avmDeploymentAttemptCleaner" />
-                        </entry>
-                    </map>
-                </property>
-            </bean>
-        </property>
-        <property name="scheduler">
-            <ref bean="schedulerFactory" />
-        </property>
-        <!-- trigger at 4:00am each day -->
-        <property name="cronExpression">
-            <value>0 0 4 * * ?</value>
-        </property>
-        <property name="startDelayMinutes">
-            <value>${system.cronJob.startDelayMinutes}</value>
-        </property>
-    </bean>
-    
-</beans>
diff --git a/pom.xml b/pom.xml
index 904cc51512..70e2661b85 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,11 +15,6 @@
             <artifactId>alfresco-legacy-lucene</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.alfresco</groupId>
-            <artifactId>alfresco-deployment</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-jlan-embed</artifactId>
@@ -726,13 +721,6 @@
             <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.alfresco</groupId>
-            <artifactId>alfresco-deployment</artifactId>
-            <version>${project.version}</version>
-            <classifier>tests</classifier>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-data-model</artifactId>