diff --git a/apps/dynamic_search/templates/search/indexes/documents/document_text.txt b/apps/dynamic_search/templates/search/indexes/documents/document_text.txt
index 3226d8f509..a3a280a7ce 100644
--- a/apps/dynamic_search/templates/search/indexes/documents/document_text.txt
+++ b/apps/dynamic_search/templates/search/indexes/documents/document_text.txt
@@ -1,5 +1,9 @@
 {{ object.content }}
-{{ object.metadata_values_string }}
+
+{% for document_metadata in object.documentmetadata_set.all %}
+    {{ document_metadata.value }}
+{% endfor %} 
+
 {{ object.cleaned_filename }}
 {{ object.filename }}
 {{ object.extension_split.1 }}
diff --git a/apps/metadata/models.py b/apps/metadata/models.py
index 93aeb921df..5e13f65c48 100644
--- a/apps/metadata/models.py
+++ b/apps/metadata/models.py
@@ -98,18 +98,3 @@ class DocumentTypeDefaults(models.Model):
     class Meta:
         verbose_name = _(u'document type defaults')
         verbose_name_plural = _(u'document types defaults')
-
-
-def document_metadata_values(document):
-    return DocumentMetadata.objects.filter(document=document).values_list('value', flat=True)
-
-
-def document_metadata_values_string(document):
-    return u' '.join(document_metadata_values(document))
-
-
-def document_metadata_dict_list(document):
-    return [{name: value} for name, value in DocumentMetadata.objects.filter(document=document).values_list('metadata_type__name', 'value')]
-
-
-Document.add_to_class('metadata_values_string', document_metadata_values_string)