diff --git a/config/alfresco/subsystems/Search/common-opencmis-context.xml b/config/alfresco/subsystems/Search/common-opencmis-context.xml
index 15b27a7ebf..d04beb6ae8 100644
--- a/config/alfresco/subsystems/Search/common-opencmis-context.xml
+++ b/config/alfresco/subsystems/Search/common-opencmis-context.xml
@@ -23,26 +23,6 @@
             <value>${solr.query.cmis.queryConsistency}</value>
         </property>
     </bean>
-
-    <bean id="search.cmis.alfresco.switching1.1" class="org.alfresco.repo.search.impl.solr.DbOrIndexSwitchingQueryLanguage" >
-        <property name="factories">
-            <list>
-                <ref bean="search.indexerAndSearcherFactory" />
-            </list>
-        </property>
-        <property name="name">
-            <value>cmis-alfresco</value>
-        </property>
-        <property name="dbQueryLanguage">
-            <ref bean="search.cmis.alfresco.db1.1" />
-        </property>
-        <property name="indexQueryLanguage">
-            <ref bean="search.cmis.alfresco.index1.1" />
-        </property>
-        <property name="queryConsistency">
-            <value>${solr.query.cmis.queryConsistency}</value>
-        </property>
-    </bean>
         
     <bean id="search.cmis.strict.switching" class="org.alfresco.repo.search.impl.solr.DbOrIndexSwitchingQueryLanguage" >
 	    <property name="factories">
@@ -63,26 +43,6 @@
             <value>${solr.query.cmis.queryConsistency}</value>
         </property>
     </bean>
-    
-    <bean id="search.cmis.strict.switching1.1" class="org.alfresco.repo.search.impl.solr.DbOrIndexSwitchingQueryLanguage" >
-        <property name="factories">
-            <list>
-                <ref bean="search.indexerAndSearcherFactory" />
-            </list>
-        </property>
-        <property name="name">
-            <value>cmis-strict</value>
-        </property>
-        <property name="dbQueryLanguage">
-            <ref bean="search.cmis.alfresco.db1.1" />
-        </property>
-        <property name="indexQueryLanguage">
-            <ref bean="search.cmis.alfresco.index1.1" />
-        </property>
-        <property name="queryConsistency">
-            <value>${solr.query.cmis.queryConsistency}</value>
-        </property>
-    </bean>
      
     <bean id="search.cmis.alfresco.db" class="org.alfresco.repo.search.impl.solr.DbCmisQueryLanguage" >
 	    <property name="factories">
@@ -100,21 +60,4 @@
             <ref bean="metdataQueryIndexesCheck" />
         </property>
     </bean>
-
-    <bean id="search.cmis.alfresco.db1.1" class="org.alfresco.repo.search.impl.solr.DbCmisQueryLanguage" >
-        <property name="factories">
-            <list>
-                <ref bean="search.indexerAndSearcherFactory" />
-            </list>
-        </property>
-        <property name="queryEngine">
-            <ref bean="search.dbQueryEngineImpl" />
-        </property>
-        <property name="cmisDictionaryService">
-            <ref bean="OpenCMISDictionaryService1.1" />
-        </property>
-        <property name="optionalPatchApplicationCheckBootstrapBean">
-            <ref bean="metdataQueryIndexesCheck" />
-        </property>
-    </bean>
 </beans>
diff --git a/config/alfresco/subsystems/Search/lucene/opencmis-context.xml b/config/alfresco/subsystems/Search/lucene/opencmis-context.xml
index 40a00fe276..e51c255c7b 100644
--- a/config/alfresco/subsystems/Search/lucene/opencmis-context.xml
+++ b/config/alfresco/subsystems/Search/lucene/opencmis-context.xml
@@ -30,19 +30,6 @@
             </list>
         </property>
     </bean>
-
-    <bean id="search.lucene.sql.cmis.strict1.1" class="org.alfresco.repo.search.impl.lucene.LuceneOpenCMISStrictSqlQueryLanguage" >
-        <property name="cmisQueryService">
-            <ref bean="search.OpenCMISQueryService1.1" />
-        </property>
-        <property name="factories">
-            <list>
-                <ref bean="search.admLuceneIndexerAndSearcherFactory" />
-                <ref bean="search.admLuceneUnIndexedIndexerAndSearcherFactory" />
-                <ref bean="search.avmLuceneIndexerAndSearcherFactory" />
-            </list>
-        </property>
-    </bean>
     
     <bean id="search.cmis.alfresco.index" class="org.alfresco.repo.search.impl.lucene.LuceneOpenCMISAlfrescoSqlQueryLanguage">
         <property name="cmisQueryService">
@@ -56,19 +43,6 @@
             </list>
         </property>
     </bean>
-
-    <bean id="search.cmis.alfresco.index1.1" class="org.alfresco.repo.search.impl.lucene.LuceneOpenCMISAlfrescoSqlQueryLanguage">
-        <property name="cmisQueryService">
-            <ref bean="search.OpenCMISQueryService1.1" />
-        </property>
-        <property name="factories">
-            <list>
-                <ref bean="search.admLuceneIndexerAndSearcherFactory" />
-                <ref bean="search.admLuceneUnIndexedIndexerAndSearcherFactory" />
-                <ref bean="search.avmLuceneIndexerAndSearcherFactory" />
-            </list>
-        </property>
-    </bean>
     	
     <bean id="search.adm.luceneQueryEngine" class="org.springframework.aop.framework.ProxyFactoryBean">
         <property name="proxyInterfaces">
diff --git a/config/alfresco/subsystems/Search/noindex/noindex-search-context.xml b/config/alfresco/subsystems/Search/noindex/noindex-search-context.xml
index 8b866e587d..364abe33a6 100644
--- a/config/alfresco/subsystems/Search/noindex/noindex-search-context.xml
+++ b/config/alfresco/subsystems/Search/noindex/noindex-search-context.xml
@@ -129,16 +129,5 @@
             <value>solr-cmis</value>
         </property>
     </bean>
-
-    <bean id="search.cmis.alfresco.index1.1" class="org.alfresco.repo.search.impl.solr.NoIndexQueryLanguage"  >
-        <property name="factories">
-            <list>
-                <ref bean="search.indexerAndSearcherFactory" />
-            </list>
-        </property>
-        <property name="name">
-            <value>solr-cmis</value>
-        </property>
-    </bean>    
 	
 </beans>
diff --git a/config/alfresco/subsystems/Search/solr/opencmis-context.xml b/config/alfresco/subsystems/Search/solr/opencmis-context.xml
index bccb6e2311..0d37f07357 100644
--- a/config/alfresco/subsystems/Search/solr/opencmis-context.xml
+++ b/config/alfresco/subsystems/Search/solr/opencmis-context.xml
@@ -30,7 +30,7 @@
             <ref bean="dictionaryService" />
         </property>
         <property name="solrQueryLanguage">
-            <ref bean="search.cmis.alfresco.switching1.1" />
+            <ref bean="search.cmis.alfresco.switching" />
         </property>
     </bean>
     
@@ -47,18 +47,4 @@
             <ref bean="search.solrQueryHTTPCLient" />
         </property>
     </bean>
-
-    <bean id="search.cmis.alfresco.index1.1" class="org.alfresco.repo.search.impl.solr.SolrQueryLanguage"  >
-        <property name="factories">
-            <list>
-                <ref bean="search.indexerAndSearcherFactory" />
-            </list>
-        </property>
-        <property name="name">
-            <value>solr-cmis</value>
-        </property>
-        <property name="solrQueryHTTPClient">
-            <ref bean="search.solrQueryHTTPCLient" />
-        </property>
-    </bean>	
 </beans>
\ No newline at end of file