diff --git a/config/alfresco/bootstrap/spaces.xml b/config/alfresco/bootstrap/spaces.xml
index c64ea36853..83572ff2b8 100644
--- a/config/alfresco/bootstrap/spaces.xml
+++ b/config/alfresco/bootstrap/spaces.xml
@@ -83,14 +83,6 @@
 						<cm:title>${spaces.scripts.name}</cm:title>
 						<cm:description>${spaces.scripts.description}</cm:description>
 					</cm:folder>
-					<cm:folder
-						view:childName="${spaces.content_forms.childname}">
-						<app:uifacets/>
-						<cm:name>${spaces.content_forms.name}</cm:name>
-						<app:icon>space-icon-default</app:icon>
-						<cm:title>${spaces.content_forms.name}</cm:title>
-						<cm:description>${spaces.content_forms.description}</cm:description>
-					</cm:folder>
 				</cm:contains>
 			</cm:folder>
 			<cm:folder view:childName="${spaces.guest_home.childname}">
@@ -117,19 +109,6 @@
 				<cm:title>${spaces.user_homes.name}</cm:title>
 				<cm:description>${spaces.user_homes.description}</cm:description>
 			</cm:folder>
-			<cm:folder view:childName="${spaces.wcm.childname}">
-				<view:acl view:inherit="false">
-					<view:ace view:access="ALLOWED">
-						<view:authority>GROUP_EVERYONE</view:authority>
-						<view:permission>Consumer</view:permission>
-					</view:ace>
-				</view:acl>
-				<app:uifacets/>
-				<cm:name>${spaces.wcm.name}</cm:name>
-				<app:icon>space-icon-default</app:icon>
-				<cm:title>${spaces.wcm.name}</cm:title>
-				<cm:description>${spaces.wcm.description}</cm:description>
-			</cm:folder>
 		</cm:contains>
 	</cm:folder>
 	
diff --git a/config/alfresco/patch/patch-services-context.xml b/config/alfresco/patch/patch-services-context.xml
index 937e8cfb2a..dfd970a5fe 100644
--- a/config/alfresco/patch/patch-services-context.xml
+++ b/config/alfresco/patch/patch-services-context.xml
@@ -537,21 +537,6 @@
             </props>
         </property>
     </bean>
-    
-    <bean id="patch.wcmFolders" class="org.alfresco.repo.admin.patch.impl.WCMFoldersPatch" parent="basePatch" >
-        <property name="id"><value>patch.wcmFolders</value></property>
-        <property name="description"><value>patch.wcmFolders.description</value></property>
-        <property name="fixesFromSchema"><value>0</value></property>
-        <property name="fixesToSchema"><value>31</value></property>
-        <property name="targetSchema"><value>32</value></property>
-        <!-- helper beans for execution -->
-        <property name="messageSource">
-            <ref bean="bootstrapSpacesMessageSource" />
-        </property>
-        <property name="importerBootstrap">
-            <ref bean="spacesBootstrap" />
-        </property>
-    </bean>
 
     <bean id="patch.authoritiesFolderPermission" class="org.alfresco.repo.admin.patch.impl.GenericBootstrapPatch" parent="basePatch" >
         <property name="id"><value>patch.authoritiesFolderPermission</value></property>