diff --git a/helm/alfresco-content-services/templates/_helpers-search.tpl b/helm/alfresco-content-services/templates/_helpers-search.tpl
index ae8d08691..f0bed7363 100644
--- a/helm/alfresco-content-services/templates/_helpers-search.tpl
+++ b/helm/alfresco-content-services/templates/_helpers-search.tpl
@@ -1,36 +1,3 @@
-{{/*
-Alfresco Repository index subsystem
-*/}}
-{{- define "repository.indexSubsystem" -}}
-{{- if or (index .Values "alfresco-search" "enabled") (index .Values "alfresco-search" "external" "host") -}}
-  solr6
-{{- else if index .Values "alfresco-search-enterprise" "enabled" -}}
-  elasticsearch
-{{- else -}}
-  none
-{{- end }}
-{{- end -}}
-
-{{/*
-Alfresco Repository search configuration
-*/}}
-{{- define "repository.indexConfig" -}}
-{{- if index .Values "alfresco-search" "external" "host" }}
--Dsolr.host={{ index .Values "alfresco-search" "external" "host" }}
--Dsolr.port={{ index .Values "alfresco-search" "external" "port" | default 8983 }}
--Dsolr.base.url={{ template "alfresco-search.baseurl" . }}
--Dsolr.secureComms={{ .Values.global.tracking.auth | default "secret" }}
-{{- else if index .Values "alfresco-search" "enabled" -}}
-{{- $alfrescoSearchContext := dict "Chart" $.Chart "Release" $.Release "Values" (index .Values "alfresco-search") }}
--Dsolr.host={{ template "alfresco-search.host" $alfrescoSearchContext }}
--Dsolr.port={{ template "alfresco-search.svcPort" $alfrescoSearchContext }}
--Dsolr.base.url={{ index .Values "alfresco-search" "ingress" "path" | default "/solr" }}
--Dsolr.secureComms={{ .Values.global.tracking.auth | default "secret" }}
-{{- else if index .Values "alfresco-search-enterprise" "enabled" }}
-{{- template "repo.elasticsearch.config" . }}
-{{- end }}
-{{- end -}}
-
 {{/*
 Compute the search URL