diff --git a/src/templates/common/identifiers/crossref_article.xml b/src/templates/common/identifiers/crossref_article.xml
index 8a6301a37a..bb5e7000a3 100755
--- a/src/templates/common/identifiers/crossref_article.xml
+++ b/src/templates/common/identifiers/crossref_article.xml
@@ -1,71 +1,69 @@
-{% extends "common/identifiers/crossref_journal_issue.xml" %}
-
-<journal_article publication_type="full_text">
-    <titles>
-        <title>{{ article.article_title }}</title>
-    </titles>
-    {% if article.authors %}
-    <contributors>
-      {% for author in article.authors %}
-        {% if author.is_corporate %}
-        <organization contributor_role="author" {% if forloop.first %}sequence="first"{% else %}sequence="additional"{% endif %}>
-            {{ author.corporate_name }}
-        </organization>
-        {% else %}
-        <person_name contributor_role="author" {% if forloop.first %}sequence="first"{% else %}sequence="additional"{% endif %}>
-            <given_name>{{ author.given_names }}</given_name>
-            <surname>{{ author.last_name }}</surname>
-            {% if author.institution %}
-            <affiliation>{{ author.affiliation }}</affiliation>
-            {% endif %}
-            {% if author.orcid %}
-            <ORCID>https://orcid.org/{{ author.orcid }}</ORCID>
-            {% endif %}
-        </person_name>
-        {% endif %}
-      {% endfor %}
-    </contributors>
-    {% endif %}
-    {% if article.abstract %}
-    <jats:abstract><jats:p>{{ article.abstract }}</jats:p></jats:abstract>
-    {% endif %}
-    <publication_date media_type="online">
-    {% if article.date_published %}
-        <month>{{ article.date_published.month }}</month>
-        <day>{{ article.date_published.day }}</day>
-        <year>{{ article.date_published.year }}</year>
-    {% else %}
-        <month>{{ article.now.month }}</month>
-        <day>{{ article.now.day }}</day>
-        <year>{{ article.now.year }}</year>
-    {% endif %}
-    </publication_date>
-    {% if article.date_accepted %}
-    <acceptance_date media_type="online">
-        <month>{{ article.date_accepted.month }}</month>
-        <day>{{ article.date_accepted.day }}</day>
-        <year>{{ article.date_accepted.year }}</year>
-    </acceptance_date>
-    {% endif %}
-    {% if article.license %}
-    <ai:program name="AccessIndicators">
-        <ai:license_ref>{{ article.license }}</ai:license_ref>
-    </ai:program>
-    {% endif %}
-    <doi_data>
-        <doi>{{ article.doi }}</doi>
-        <resource>{{ article.article_url }}</resource>
-        <collection property="crawler-based">
-            <item crawler="iParadigms">
-                {% if article.pdf_url %}
-                    <resource>{{ article.pdf_url }}</resource>
+{% spaceless %}<journal_article publication_type="full_text">{% endspaceless %}
+                <titles>
+                    <title>{{ article.article_title }}</title>
+                </titles>
+                {% if article.authors %}
+                <contributors>
+                  {% for author in article.authors %}
+                    {% if author.is_corporate %}
+                    <organization contributor_role="author" {% if forloop.first %}sequence="first"{% else %}sequence="additional"{% endif %}>
+                        {{ author.corporate_name }}
+                    </organization>
+                    {% else %}
+                    <person_name contributor_role="author" {% if forloop.first %}sequence="first"{% else %}sequence="additional"{% endif %}>
+                        <given_name>{{ author.given_names }}</given_name>
+                        <surname>{{ author.last_name }}</surname>
+                        {% if author.institution %}
+                        <affiliation>{{ author.affiliation }}</affiliation>
+                        {% endif %}
+                        {% if author.orcid %}
+                        <ORCID>https://orcid.org/{{ author.orcid }}</ORCID>
+                        {% endif %}
+                    </person_name>
+                    {% endif %}
+                  {% endfor %}
+                </contributors>
+                {% endif %}
+                {% if article.abstract %}
+                <jats:abstract><jats:p>{{ article.abstract }}</jats:p></jats:abstract>
+                {% endif %}
+                <publication_date media_type="online">
+                {% if article.date_published %}
+                    <month>{{ article.date_published.month }}</month>
+                    <day>{{ article.date_published.day }}</day>
+                    <year>{{ article.date_published.year }}</year>
                 {% else %}
+                    <month>{{ article.now.month }}</month>
+                    <day>{{ article.now.day }}</day>
+                    <year>{{ article.now.year }}</year>
+                {% endif %}
+                </publication_date>
+                {% if article.date_accepted %}
+                <acceptance_date media_type="online">
+                    <month>{{ article.date_accepted.month }}</month>
+                    <day>{{ article.date_accepted.day }}</day>
+                    <year>{{ article.date_accepted.year }}</year>
+                </acceptance_date>
+                {% endif %}
+                {% if article.license %}
+                <ai:program name="AccessIndicators">
+                    <ai:license_ref>{{ article.license }}</ai:license_ref>
+                </ai:program>
+                {% endif %}
+                <doi_data>
+                    <doi>{{ article.doi }}</doi>
                     <resource>{{ article.article_url }}</resource>
+                    <collection property="crawler-based">
+                        <item crawler="iParadigms">
+                        {% if article.pdf_url %}
+                            <resource>{{ article.pdf_url }}</resource>
+                        {% else %}
+                            <resource>{{ article.article_url }}</resource>
+                        {% endif %}
+                        </item>
+                    </collection>
+                </doi_data>
+                {% if article.citation_list %}
+                    {{ article.citation_list|safe }}
                 {% endif %}
-            </item>
-        </collection>
-    </doi_data>
-    {% if article.citation_list %}
-        {{ article.citation_list|safe }}
-    {% endif %}
-</journal_article>
+            </journal_article>
diff --git a/src/templates/common/identifiers/crossref_journal_issue.xml b/src/templates/common/identifiers/crossref_journal_issue.xml
index c010a0d715..c27612f90c 100644
--- a/src/templates/common/identifiers/crossref_journal_issue.xml
+++ b/src/templates/common/identifiers/crossref_journal_issue.xml
@@ -1,35 +1,33 @@
-{% extends "common/identifiers/crossref_doi_batch.xml" %}
+{% spaceless %}<journal_metadata>{% endspaceless %}
+                <full_title>{{ crossref_issue.journal.journal_title }}</full_title>
+                {% if crossref_issue.journal.print_issn and crossref_issue.journal.print_issn != '0000-0000' %}
+                <issn media_type="print">{{ crossref_issue.journal.print_issn }}</issn>
+                {% endif %}
+                {% if crossref_issue.journal.journal_issn and crossref_issue.journal.journal_issn != '0000-0000' %}
+                <issn media_type="electronic">{{ crossref_issue.journal.journal_issn }}</issn>
+                {% endif %}
+            </journal_metadata>
 
-<journal_metadata>
-    <full_title>{{ crossref_issue.journal_title }}</full_title>
-    {% if crossref_issue.print_issn and crossref_issue.print_issn != '0000-0000' %}
-    <issn media_type="print">{{ crossref_issue.print_issn }}</issn>
-    {% endif %}
-    {% if crossref_issue.journal_issn and crossref_issue.journal_issn != '0000-0000' %}
-    <issn media_type="electronic">{{ crossref_issue.journal_issn }}</issn>
-    {% endif %}
-</journal_metadata>
+            {% if crossref_issue.issue and crossref_issue.issue.date %}
+            <journal_issue>
+                {% if crossref_issue.issue.issue_title %}
+                <titles>
+                    <title>{{ crossref_issue.issue.issue_title }}</title>
+                </titles>
+                {% endif %}
+                <publication_date media_type="online">
+                    <month>{{ crossref_issue.issue.date.month }}</month>
+                    <day>{{ crossref_issue.issue.date.day }}</day>
+                    <year>{{ crossref_issue.issue.date.year }}</year>
+                </publication_date>
 
-{% if crossref_issue.issue and crossref_issue.issue.date %}
-<journal_issue>
-    {% if crossref_issue.issue.issue_title %}
-    <titles>
-        <title>{{ crossref_issue.issue.issue_title }}</title>
-    </titles>
-    {% endif %}
-    <publication_date media_type="online">
-        <month>{{ crossref_issue.issue.date.month }}</month>
-        <day>{{ crossref_issue.issue.date.day }}</day>
-        <year>{{ crossref_issue.issue.date.year }}</year>
-    </publication_date>
+                <journal_volume>
+                    <volume>{{ crossref_issue.issue.volume }}</volume>
+                </journal_volume>
+                <issue>{{ crossref_issue.issue.issue }}</issue>
+            </journal_issue>
+            {% endif %}
 
-    <journal_volume>
-        <volume>{{ crossref_issue.issue.volume }}</volume>
-    </journal_volume>
-    <issue>{{ crossref_issue.issue.issue }}</issue>
-</journal_issue>
-{% endif %}
-
-{% for article in crossref_issue.articles %}
-    {% include "common/identifiers/crossref_article.xml" with article=article %}
-{% endfor %}
+            {% for article in crossref_issue.articles %}
+                {% include "common/identifiers/crossref_article.xml" with article=article %}
+            {% endfor %}