diff --git a/search-services/alfresco-solr/pom.xml b/search-services/alfresco-solr/pom.xml
index 8a37a0406..d206eb2ac 100644
--- a/search-services/alfresco-solr/pom.xml
+++ b/search-services/alfresco-solr/pom.xml
@@ -269,86 +269,6 @@
                     </execution>
                 </executions>
             </plugin>
-
-<!--             <plugin>
-                <artifactId>maven-resources-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy-instance-resources</id>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <phase>generate-resources</phase>
-                        <configuration>
-                            <outputDirectory>${solr.nossl.instance.target.folder}</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>${solr.instance.source.folder}</directory>
-                                    <excludes>
-                                        <exclude>**/ssl.repo*</exclude>
-                                    </excludes>
-                                    <filtering>true</filtering>
-                                </resource>
-                                <resource>
-                                    <directory>${solr.instance.source.folder}</directory>
-                                    <includes>
-                                        <include>**/ssl.repo*</include>
-                                    </includes>
-                                    <filtering>false</filtering>
-                                </resource>
-                            </resources>
-                            <useDefaultDelimiters>false</useDefaultDelimiters>
-                            <delimiters>
-                                <delimiter>@@</delimiter>
-                            </delimiters>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>copy-instance-ssl</id>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <phase>generate-resources</phase>
-                        <configuration>
-                            <outputDirectory>${solr.ssl.instance.target.folder}</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>${solr.nossl.instance.target.folder}</directory>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <inherited>false</inherited>
-                <executions>
-                    <execution>
-                        <id>package-config-zip</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <attach>true</attach>
-                            <descriptors>
-                                <descriptor>
-                                    source/assembly/solr-instance-zip-nossl.xml
-                                </descriptor>
-                                <descriptor>
-                                    source/assembly/solr-instance-zip-ssl.xml
-                                </descriptor>
-                                <descriptor>
-                                    source/assembly/solr-instance-zip-sharding.xml
-                                </descriptor>
-                            </descriptors>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        -->
         </plugins>
     </build>
 
diff --git a/search-services/alfresco-solr/src/main/resources/assembly/solr-instance-zip-nossl.xml b/search-services/alfresco-solr/src/main/resources/assembly/solr-instance-zip-nossl.xml
deleted file mode 100644
index cdccab339..000000000
--- a/search-services/alfresco-solr/src/main/resources/assembly/solr-instance-zip-nossl.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<assembly
-    xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1 http://maven.apache.org/xsd/assembly-1.1.1.xsd">
-    <!-- To build this, run "mvn package assembly:assembly" -->
-    <id>config</id>
-    <formats>
-        <format>zip</format>
-    </formats>
-    <includeBaseDirectory>false</includeBaseDirectory>
-    <fileSets>
-        <fileSet>
-            <directory>${solr.nossl.instance.target.folder}</directory>
-            <outputDirectory/>
-        </fileSet>
-    </fileSets>
-</assembly>
diff --git a/search-services/alfresco-solr/src/main/resources/assembly/solr-instance-zip-sharding.xml b/search-services/alfresco-solr/src/main/resources/assembly/solr-instance-zip-sharding.xml
deleted file mode 100644
index 532f08189..000000000
--- a/search-services/alfresco-solr/src/main/resources/assembly/solr-instance-zip-sharding.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<assembly
-    xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1 http://maven.apache.org/xsd/assembly-1.1.1.xsd">
-    <!-- To build this, run "mvn package assembly:assembly" -->
-    <id>config-sharding</id>
-    <formats>
-        <format>zip</format>
-    </formats>
-    <includeBaseDirectory>false</includeBaseDirectory>
-
-    <!-- Filter out *-SpacesStore folers -->
-    <fileSets>
-        <fileSet>
-            <directory>${solr.nossl.instance.target.folder}</directory>
-            <outputDirectory/>
-            <excludes>
-                <exclude>archive-SpacesStore/</exclude>
-                <exclude>workspace-SpacesStore/</exclude>
-                <exclude>conf/shared.properties.sample</exclude>
-            </excludes>
-        </fileSet>
-    </fileSets>
-
-    <!-- Rename conf/shared.properties.sample to conf/shared.properties -->
-    <files>
-        <file>
-            <source>${solr.nossl.instance.target.folder}/conf/shared.properties.sample</source>
-            <outputDirectory>conf</outputDirectory>
-            <destName>shared.properties</destName>
-        </file>
-    </files>
-</assembly>
diff --git a/search-services/alfresco-solr/src/main/resources/assembly/solr-instance-zip-ssl.xml b/search-services/alfresco-solr/src/main/resources/assembly/solr-instance-zip-ssl.xml
deleted file mode 100644
index 3994ca3d9..000000000
--- a/search-services/alfresco-solr/src/main/resources/assembly/solr-instance-zip-ssl.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<assembly
-    xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1 http://maven.apache.org/xsd/assembly-1.1.1.xsd">
-    <!-- To build this, run "mvn package assembly:assembly" -->
-    <id>config-ssl</id>
-    <formats>
-        <format>zip</format>
-    </formats>
-    <includeBaseDirectory>false</includeBaseDirectory>
-    <fileSets>
-        <fileSet>
-            <directory>${solr.ssl.instance.target.folder}</directory>
-            <outputDirectory/>
-        </fileSet>
-    </fileSets>
-</assembly>