diff --git a/config/alfresco/bootstrap/team-sample-sites/swsdp/AVM.zip b/config/alfresco/bootstrap/team-sample-sites/swsdp/AVM.zip
deleted file mode 100644
index 52c828cabc..0000000000
Binary files a/config/alfresco/bootstrap/team-sample-sites/swsdp/AVM.zip and /dev/null differ
diff --git a/config/alfresco/patch/patch-services-context.xml b/config/alfresco/patch/patch-services-context.xml
index b738cb2862..42fa314ca9 100644
--- a/config/alfresco/patch/patch-services-context.xml
+++ b/config/alfresco/patch/patch-services-context.xml
@@ -2752,7 +2752,6 @@
         <property name="targetSchema"><value>10000</value></property>
         <property name="spacesBootstrap" ref="siteLoadBootstrap-Spaces" />
         <property name="usersBootstrap" ref="siteLoadBootstrap-Users" />
-        <property name="avmBootstrap" ref="siteLoadBootstrap-AVM" />
         <property name="siteService" ref="siteService" />
         <property name="authorityService" ref="authorityService" />
         <property name="behaviourFilter" ref="policyBehaviourFilter" />
diff --git a/source/java/org/alfresco/repo/admin/patch/impl/SiteLoadPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/SiteLoadPatch.java
index d5c51cbc7f..10bee9abb8 100644
--- a/source/java/org/alfresco/repo/admin/patch/impl/SiteLoadPatch.java
+++ b/source/java/org/alfresco/repo/admin/patch/impl/SiteLoadPatch.java
@@ -33,11 +33,9 @@ import java.util.StringTokenizer;
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.admin.patch.AbstractPatch;
-import org.alfresco.repo.importer.AVMZipBootstrap;
 import org.alfresco.repo.importer.ImporterBootstrap;
 import org.alfresco.repo.policy.BehaviourFilter;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
-import org.alfresco.repo.site.SiteModel;
 import org.alfresco.service.cmr.security.AuthorityService;
 import org.alfresco.service.cmr.site.SiteInfo;
 import org.alfresco.service.cmr.site.SiteService;
@@ -60,11 +58,9 @@ public class SiteLoadPatch extends AbstractPatch
     public static final String PROPERTIES_PEOPLE = "people";
     public static final String PROPERTIES_GROUPS = "groups";
     public static final String PROPERTIES_CONTENTS = "contents";
-    public static final String PROPERTIES_AVM = "avm";
     
     private static final Map<String,String> DEFAULT_PATHS = new HashMap<String, String>();
     static {
-        DEFAULT_PATHS.put(PROPERTIES_AVM, null);
         DEFAULT_PATHS.put(PROPERTIES_USERS, "/${alfresco_user_store.system_container.childname}/${alfresco_user_store.user_container.childname}"); 
         DEFAULT_PATHS.put(PROPERTIES_PEOPLE, "/${system.system_container.childname}/${system.people_container.childname}"); 
         DEFAULT_PATHS.put(PROPERTIES_GROUPS, null);
@@ -86,7 +82,6 @@ public class SiteLoadPatch extends AbstractPatch
     
     private ImporterBootstrap spacesBootstrap;
     private ImporterBootstrap usersBootstrap;
-    private AVMZipBootstrap avmBootstrap;
     
     private Map<String,Properties> bootstrapViews;
     
@@ -114,10 +109,6 @@ public class SiteLoadPatch extends AbstractPatch
     {
         this.usersBootstrap = usersBootstrap;
     }
-    public void setAvmBootstrap(AVMZipBootstrap avmBootstrap)
-    {
-        this.avmBootstrap = avmBootstrap;
-    }
 
     /**
      * Sets the details of the bootstraps to perform
@@ -280,15 +271,6 @@ public class SiteLoadPatch extends AbstractPatch
             }
         }
         
-        // Load the AVM contents
-        if(bootstrapViews.containsKey(PROPERTIES_AVM))
-        {
-            avmBootstrap.setLocation(
-                  bootstrapViews.get(PROPERTIES_AVM).getProperty("location")
-            );
-            avmBootstrap.bootstrap();
-        }
-        
         // Load the Main (ACP) Contents
         if(bootstrapViews.containsKey(PROPERTIES_CONTENTS))
         {