diff --git a/dspace/config/crosswalks/DIM2DataCite.xsl b/dspace/config/crosswalks/DIM2DataCite.xsl
index bc147bc422..e92c371d6a 100644
--- a/dspace/config/crosswalks/DIM2DataCite.xsl
+++ b/dspace/config/crosswalks/DIM2DataCite.xsl
@@ -5,7 +5,7 @@
     Created on : January 23, 2013, 1:26 PM
     Updated on : November 26, 2015, 3:00 PM
     Author     : pbecker, ffuerste
-    Description: Converts metadata from DSpace Intermediat Format (DIM) into
+    Description: Converts metadata from DSpace Intermediate Format (DIM) into
                  metadata following the DataCite Schema for the Publication and
                  Citation of Research Data, Version 3.1
 -->
diff --git a/dspace/config/crosswalks/DIM2EZID.xsl b/dspace/config/crosswalks/DIM2EZID.xsl
index f711ce4b18..2685a2a6e0 100644
--- a/dspace/config/crosswalks/DIM2EZID.xsl
+++ b/dspace/config/crosswalks/DIM2EZID.xsl
@@ -5,7 +5,7 @@
     Created on : January 23, 2013, 1:26 PM
     Updated on : November 26, 2015, 3:00 PM
     Author     : pbecker, ffuerste
-    Description: Converts metadata from DSpace Intermediat Format (DIM) into
+    Description: Converts metadata from DSpace Intermediate Format (DIM) into
                  metadata following the DataCite Schema for the Publication and
                  Citation of Research Data, Version 3.1, for use with EZID.
                  Copied from DIM2DataCite.xsl, with small changes.
diff --git a/dspace/config/crosswalks/mods.properties b/dspace/config/crosswalks/mods.properties
index b8e07c7504..b4755c16db 100644
--- a/dspace/config/crosswalks/mods.properties
+++ b/dspace/config/crosswalks/mods.properties
@@ -1,10 +1,6 @@
 # Default MODS crosswalk configuration file.  See class
 #  org.dspace.content.crosswalk.MODSDisseminationCrosswalk for details.
 #
-# Revision: $Revision$
-#
-# Date:     $Date$
-#
 dc.contributor = <mods:name><mods:namePart>%s</mods:namePart></mods:name> | mods:namePart/text()
 dc.contributor.advisor = <mods:name><mods:role><mods:roleTerm type="text">advisor</mods:roleTerm></mods:role><mods:namePart>%s</mods:namePart></mods:name> | mods:namePart/text()
 dc.contributor.author = <mods:name><mods:role><mods:roleTerm type="text">author</mods:roleTerm></mods:role><mods:namePart>%s</mods:namePart></mods:name> | mods:namePart/text()
diff --git a/dspace/config/crosswalks/oai/metadataFormats/didl.xsl b/dspace/config/crosswalks/oai/metadataFormats/didl.xsl
index 51d24d2757..61f5cc4652 100644
--- a/dspace/config/crosswalks/oai/metadataFormats/didl.xsl
+++ b/dspace/config/crosswalks/oai/metadataFormats/didl.xsl
@@ -1,18 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- 
-
-
-    The contents of this file are subject to the license and copyright
-    detailed in the LICENSE and NOTICE files at the root of the source
-    tree and available online at
-
-    http://www.dspace.org/license/
-	Developed by DSpace @ Lyncode (dspace at lyncode dot com)
-	
-	> http://www.openarchives.org/OAI/2.0/oai_dc.xsd
-
- -->
-<xsl:stylesheet 
+<!-- http://www.openarchives.org/OAI/2.0/oai_dc.xsd -->
+<xsl:stylesheet
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:doc="http://www.lyncode.com/xoai"
 	version="1.0">
diff --git a/dspace/config/crosswalks/oai/metadataFormats/dim.xsl b/dspace/config/crosswalks/oai/metadataFormats/dim.xsl
index dcc96de482..667cde0da4 100644
--- a/dspace/config/crosswalks/oai/metadataFormats/dim.xsl
+++ b/dspace/config/crosswalks/oai/metadataFormats/dim.xsl
@@ -1,13 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- 
-
-	The contents of this file are subject to the license and copyright detailed 
-	in the LICENSE and NOTICE files at the root of the source tree and available 
-	online at http://www.dspace.org/license/ 
-	
-	Developed by DSpace @ Lyncode (dspace at lyncode dot com) 
-	
--->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:doc="http://www.lyncode.com/xoai"
                 xmlns:dim="http://www.dspace.org/xmlns/dspace/dim" version="1.0">
diff --git a/dspace/config/crosswalks/oai/metadataFormats/etdms.xsl b/dspace/config/crosswalks/oai/metadataFormats/etdms.xsl
index 05a85c58ee..13ca117a82 100644
--- a/dspace/config/crosswalks/oai/metadataFormats/etdms.xsl
+++ b/dspace/config/crosswalks/oai/metadataFormats/etdms.xsl
@@ -1,15 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- 
-
-
-    The contents of this file are subject to the license and copyright
-    detailed in the LICENSE and NOTICE files at the root of the source
-    tree and available online at
-
-    http://www.dspace.org/license/
-	Developed by DSpace @ Lyncode (dspace at lyncode dot com)
-
- -->
 <xsl:stylesheet 
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:doc="http://www.lyncode.com/xoai"
diff --git a/dspace/config/crosswalks/oai/metadataFormats/junii2.xsl b/dspace/config/crosswalks/oai/metadataFormats/junii2.xsl
index f06f06c3a2..77f2469c48 100644
--- a/dspace/config/crosswalks/oai/metadataFormats/junii2.xsl
+++ b/dspace/config/crosswalks/oai/metadataFormats/junii2.xsl
@@ -1,14 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!--
-
-  The contents of this file are subject to the license and copyright
-  detailed in the LICENSE and NOTICE files at the root of the source
-  tree and available online at
-
-  http://www.dspace.org/license/
-  Developed by Keiji Suzuki
-
- -->
 <xsl:stylesheet version="1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:doc="http://www.lyncode.com/xoai"
diff --git a/dspace/config/crosswalks/oai/metadataFormats/marc.xsl b/dspace/config/crosswalks/oai/metadataFormats/marc.xsl
index 449d0b40ae..badaf3580f 100644
--- a/dspace/config/crosswalks/oai/metadataFormats/marc.xsl
+++ b/dspace/config/crosswalks/oai/metadataFormats/marc.xsl
@@ -1,17 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- 
-
-
-    The contents of this file are subject to the license and copyright
-    detailed in the LICENSE and NOTICE files at the root of the source
-    tree and available online at
-
-    http://www.dspace.org/license/
-	Developed by DSpace @ Lyncode (dspace at lyncode dot com)
-	
-	> http://www.loc.gov/marc/bibliographic/ecbdlist.html
-
- -->
+<!-- http://www.loc.gov/marc/bibliographic/ecbdlist.html -->
 <xsl:stylesheet 
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:doc="http://www.lyncode.com/xoai"
diff --git a/dspace/config/crosswalks/oai/metadataFormats/mets.xsl b/dspace/config/crosswalks/oai/metadataFormats/mets.xsl
index a8cce3dfd8..41d683f075 100644
--- a/dspace/config/crosswalks/oai/metadataFormats/mets.xsl
+++ b/dspace/config/crosswalks/oai/metadataFormats/mets.xsl
@@ -1,17 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- 
-
-
-    The contents of this file are subject to the license and copyright
-    detailed in the LICENSE and NOTICE files at the root of the source
-    tree and available online at
-
-    http://www.dspace.org/license/
-    
-	Developed by DSpace @ Lyncode (dspace at lyncode dot com)
-	
-	>  http://www.loc.gov/standards/mets/mets.xsd
--->
+<!-- http://www.loc.gov/standards/mets/mets.xsd -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:doc="http://www.lyncode.com/xoai" 
     xmlns:date="http://exslt.org/dates-and-times" 
diff --git a/dspace/config/crosswalks/oai/metadataFormats/mods.xsl b/dspace/config/crosswalks/oai/metadataFormats/mods.xsl
index 4a503b99b2..f1a97ca617 100644
--- a/dspace/config/crosswalks/oai/metadataFormats/mods.xsl
+++ b/dspace/config/crosswalks/oai/metadataFormats/mods.xsl
@@ -1,15 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- 
-
-
-    The contents of this file are subject to the license and copyright
-    detailed in the LICENSE and NOTICE files at the root of the source
-    tree and available online at
-
-    http://www.dspace.org/license/
-	Developed by DSpace @ Lyncode (dspace at lyncode dot com)
-
- -->
 <xsl:stylesheet 
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:doc="http://www.lyncode.com/xoai"
diff --git a/dspace/config/crosswalks/oai/metadataFormats/oai_dc.xsl b/dspace/config/crosswalks/oai/metadataFormats/oai_dc.xsl
index 549405d5f5..f69867af0f 100644
--- a/dspace/config/crosswalks/oai/metadataFormats/oai_dc.xsl
+++ b/dspace/config/crosswalks/oai/metadataFormats/oai_dc.xsl
@@ -1,17 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- 
-
-
-    The contents of this file are subject to the license and copyright
-    detailed in the LICENSE and NOTICE files at the root of the source
-    tree and available online at
-
-    http://www.dspace.org/license/
-	Developed by DSpace @ Lyncode (dspace at lyncode dot com)
-	
-	> http://www.openarchives.org/OAI/2.0/oai_dc.xsd
-
- -->
+<!--  http://www.openarchives.org/OAI/2.0/oai_dc.xsl-->
 <xsl:stylesheet 
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:doc="http://www.lyncode.com/xoai"
diff --git a/dspace/config/crosswalks/oai/metadataFormats/ore.xsl b/dspace/config/crosswalks/oai/metadataFormats/ore.xsl
index 1c8085c96e..48ba570c10 100644
--- a/dspace/config/crosswalks/oai/metadataFormats/ore.xsl
+++ b/dspace/config/crosswalks/oai/metadataFormats/ore.xsl
@@ -1,15 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- 
-
-
-    The contents of this file are subject to the license and copyright
-    detailed in the LICENSE and NOTICE files at the root of the source
-    tree and available online at
-
-    http://www.dspace.org/license/
-	Developed by DSpace @ Lyncode (dspace at lyncode dot com)
-
- -->
 <xsl:stylesheet 
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:doc="http://www.lyncode.com/xoai"
diff --git a/dspace/config/crosswalks/oai/metadataFormats/qdc.xsl b/dspace/config/crosswalks/oai/metadataFormats/qdc.xsl
index 9cacd42b30..4a5ef3a442 100644
--- a/dspace/config/crosswalks/oai/metadataFormats/qdc.xsl
+++ b/dspace/config/crosswalks/oai/metadataFormats/qdc.xsl
@@ -1,17 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- 
-
-
-    The contents of this file are subject to the license and copyright
-    detailed in the LICENSE and NOTICE files at the root of the source
-    tree and available online at
-
-    http://www.dspace.org/license/
-	Developed by DSpace @ Lyncode <jmelo@lyncode.com>
-	
-	> http://www.openarchives.org/OAI/2.0/oai_dc.xsd
-
- -->
+<!-- http://www.openarchives.org/OAI/2.0/oai_dc.xsd -->
 <xsl:stylesheet 
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:doc="http://www.lyncode.com/xoai"
diff --git a/dspace/config/crosswalks/oai/metadataFormats/rdf.xsl b/dspace/config/crosswalks/oai/metadataFormats/rdf.xsl
index 36e6dc9fe6..95e4434d80 100644
--- a/dspace/config/crosswalks/oai/metadataFormats/rdf.xsl
+++ b/dspace/config/crosswalks/oai/metadataFormats/rdf.xsl
@@ -1,15 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- 
-
-
-    The contents of this file are subject to the license and copyright
-    detailed in the LICENSE and NOTICE files at the root of the source
-    tree and available online at
-
-    http://www.dspace.org/license/
-	Developed by DSpace @ Lyncode (dspace at lyncode dot com)
-
- -->
 <xsl:stylesheet 
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:doc="http://www.lyncode.com/xoai"
diff --git a/dspace/config/crosswalks/oai/metadataFormats/uketd_dc.xsl b/dspace/config/crosswalks/oai/metadataFormats/uketd_dc.xsl
index bebb9b9be7..a3a4e66670 100644
--- a/dspace/config/crosswalks/oai/metadataFormats/uketd_dc.xsl
+++ b/dspace/config/crosswalks/oai/metadataFormats/uketd_dc.xsl
@@ -1,15 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!--
-
-
-    The contents of this file are subject to the license and copyright
-    detailed in the LICENSE and NOTICE files at the root of the source
-    tree and available online at
-
-    http://www.dspace.org/license/
-    Developed by DSpace @ Lyncode (dspace at lyncode dot com)
-
- -->
 <xsl:stylesheet
         xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
         xmlns:doc="http://www.lyncode.com/xoai"
@@ -246,4 +235,4 @@
 
         </uketd_dc:uketddc>
     </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
diff --git a/dspace/config/crosswalks/oai/metadataFormats/xoai.xsl b/dspace/config/crosswalks/oai/metadataFormats/xoai.xsl
index 6bffc3dcee..1cdd71d398 100644
--- a/dspace/config/crosswalks/oai/metadataFormats/xoai.xsl
+++ b/dspace/config/crosswalks/oai/metadataFormats/xoai.xsl
@@ -1,16 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- 
-
-
-    The contents of this file are subject to the license and copyright
-    detailed in the LICENSE and NOTICE files at the root of the source
-    tree and available online at
-
-    http://www.dspace.org/license/
-
-	Developed by DSpace @ Lyncode (dspace at lyncode dot com) 
-
- -->
 <xsl:stylesheet 
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:doc="http://www.lyncode.com/xoai"
diff --git a/dspace/config/crosswalks/oai/transformers/driver.xsl b/dspace/config/crosswalks/oai/transformers/driver.xsl
index 2456003e02..e22952c341 100644
--- a/dspace/config/crosswalks/oai/transformers/driver.xsl
+++ b/dspace/config/crosswalks/oai/transformers/driver.xsl
@@ -1,18 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-
-
-    The contents of this file are subject to the license and copyright
-    detailed in the LICENSE and NOTICE files at the root of the source
-    tree and available online at
-
-    http://www.dspace.org/license/
-    
-	Developed by DSpace @ Lyncode (dspace at lyncode dot com) 
-	Following Driver Guidelines 2.0:
-		- http://www.driver-support.eu/managers.html#guidelines
-
- -->
+<!-- Following Driver Guidelines 2.0: http://www.driver-support.eu/managers.html#guidelines -->
 <xsl:stylesheet version="1.0"
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:doc="http://www.lyncode.com/xoai">
 	<xsl:output indent="yes" method="xml" omit-xml-declaration="yes" />
diff --git a/dspace/config/crosswalks/oai/transformers/openaire.xsl b/dspace/config/crosswalks/oai/transformers/openaire.xsl
index b2b074aa5f..1b910d83e1 100644
--- a/dspace/config/crosswalks/oai/transformers/openaire.xsl
+++ b/dspace/config/crosswalks/oai/transformers/openaire.xsl
@@ -1,17 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-
-    The contents of this file are subject to the license and copyright
-    detailed in the LICENSE and NOTICE files at the root of the source
-    tree and available online at
-
-    http://www.dspace.org/license/
-
-	Developed by DSpace @ Lyncode (dspace at lyncode dot com) 
-	Following OpenAIRE Guidelines 1.1:
-		- http://www.openaire.eu/component/content/article/207
-
- -->
+<!-- Following OpenAIRE Guidelines 1.1: http://www.openaire.eu/component/content/article/207 -->
 <xsl:stylesheet version="1.0"
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:doc="http://www.lyncode.com/xoai">
 	<xsl:output indent="yes" method="xml" omit-xml-declaration="yes" />
diff --git a/dspace/config/crosswalks/oai/xoai.xml b/dspace/config/crosswalks/oai/xoai.xml
index 9417ce7462..5716163324 100644
--- a/dspace/config/crosswalks/oai/xoai.xml
+++ b/dspace/config/crosswalks/oai/xoai.xml
@@ -1,14 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-
-    The contents of this file are subject to the license and copyright
-    detailed in the LICENSE and NOTICE files at the root of the source
-    tree and available online at
-
-    http://www.dspace.org/license/
-
-	Developed by DSpace @ Lyncode (dspace at lyncode dot com)
- -->
 <Configuration indented="false" maxListIdentifiersSize="100" maxListRecordsSize="100"
                maxListSetsSize="100" stylesheet="static/style.xsl"
                xmlns="http://www.lyncode.com/XOAIConfiguration">
diff --git a/dspace/config/crosswalks/sample-crosswalk-DIM2DC.xsl b/dspace/config/crosswalks/sample-crosswalk-DIM2DC.xsl
index 0f96cd7a64..dea415cac7 100644
--- a/dspace/config/crosswalks/sample-crosswalk-DIM2DC.xsl
+++ b/dspace/config/crosswalks/sample-crosswalk-DIM2DC.xsl
@@ -12,10 +12,6 @@
 
         This is only fit for a simple smoke test of the XSLT-based
         crosswalk plugin, do not use it for anthing more serious.
-
- Revision: $Revision$
- Date:     $Date$
-
  -->
 
         <xsl:template match="@* | node()">
diff --git a/dspace/config/crosswalks/sword-swap-ingest.xsl b/dspace/config/crosswalks/sword-swap-ingest.xsl
index c56fe455e7..eddee80d5f 100644
--- a/dspace/config/crosswalks/sword-swap-ingest.xsl
+++ b/dspace/config/crosswalks/sword-swap-ingest.xsl
@@ -1,42 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- sord-swap-ingest.xsl
- * 
- * Copyright (c) 2007, Aberystwyth University
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *  - Redistributions of source code must retain the above
- *    copyright notice, this list of conditions and the
- *    following disclaimer.
- *
- *  - Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- *  - Neither the name of the Centre for Advanced Software and
- *    Intelligent Systems (CASIS) nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
- * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- -->
-
 <xsl:stylesheet
         xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
         xmlns:dim="http://www.dspace.org/xmlns/dspace/dim"
diff --git a/dspace/config/registries/bitstream-formats.xml b/dspace/config/registries/bitstream-formats.xml
index 0d12d2c162..fea8bedf3b 100644
--- a/dspace/config/registries/bitstream-formats.xml
+++ b/dspace/config/registries/bitstream-formats.xml
@@ -1,12 +1,6 @@
 <?xml version="1.0"?>
 
 <!--
-  - bitstream-formats.xml
-  -
-  - Version:  $Revision$
-  -
-  - Date:     $Date$
-  -
   - Initial contents for bitstream format registry.  Once the registry has
   - been loaded, this file becomes obsolete; the current version of the
   - registry must be read from the database.  Use
diff --git a/dspace/config/registries/dcterms-types.xml b/dspace/config/registries/dcterms-types.xml
index de1b34c9c8..87531db03f 100644
--- a/dspace/config/registries/dcterms-types.xml
+++ b/dspace/config/registries/dcterms-types.xml
@@ -1,12 +1,6 @@
 <?xml version="1.0"?>
 
 <!--
-  - dcterms-types.xml
-  -
-  - Version:  $Revision$
-  -
-  - Date:     $Date$
-  -
   - DCTerms registry contributed to eventually replace dublin-core-types.xml
   - 
   - <dc-type>
@@ -17,8 +11,6 @@
   - </dc-type>
   -->
 
-<!-- start of XML -->
-
 <dspace-dc-types>
 
   <dspace-header>
diff --git a/dspace/config/registries/dublin-core-types.xml b/dspace/config/registries/dublin-core-types.xml
index 5be36b72a4..50e79b0d61 100644
--- a/dspace/config/registries/dublin-core-types.xml
+++ b/dspace/config/registries/dublin-core-types.xml
@@ -1,12 +1,6 @@
 <?xml version="1.0"?>
 
 <!--
-  - dublin-core-types.xml
-  -
-  - Version:  $Revision$
-  -
-  - Date:     $Date$
-  -
   - Initial contents for Dublin Core type registry.  Once the registry has
   - been loaded, this file becomes obsolete; the current version of the
   - registry must be read from the database.
@@ -21,8 +15,6 @@
   - </dc-type>
   -->
 
-<!-- start of XML -->
-
 <dspace-dc-types>
 
   <dspace-header>
diff --git a/dspace/config/registries/sword-metadata.xml b/dspace/config/registries/sword-metadata.xml
index c4bffde410..b51b00af0e 100644
--- a/dspace/config/registries/sword-metadata.xml
+++ b/dspace/config/registries/sword-metadata.xml
@@ -1,42 +1,4 @@
 <?xml version="1.0"?>
-<!-- sword-metadata.xsl
- *
- * Copyright (c) 2007, Aberystwyth University
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *  - Redistributions of source code must retain the above
- *    copyright notice, this list of conditions and the
- *    following disclaimer.
- *
- *  - Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- *  - Neither the name of the Centre for Advanced Software and
- *    Intelligent Systems (CASIS) nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
- * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- -->
-
 <dspace-dc-types>
 
   <dspace-header>
diff --git a/dspace/config/spring/api/bte.xml b/dspace/config/spring/api/bte.xml
index 6cc55a0c7e..b081ec5444 100644
--- a/dspace/config/spring/api/bte.xml
+++ b/dspace/config/spring/api/bte.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<!-- TEST-SPRING.XML -->
-
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
diff --git a/dspace/config/spring/api/discovery-solr.xml b/dspace/config/spring/api/discovery-solr.xml
index 25ed86e705..120e3b9eb2 100644
--- a/dspace/config/spring/api/discovery-solr.xml
+++ b/dspace/config/spring/api/discovery-solr.xml
@@ -1,13 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    The contents of this file are subject to the license and copyright
-    detailed in the LICENSE and NOTICE files at the root of the source
-    tree and available online at
-
-    http://www.dspace.org/license/
-
--->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:context="http://www.springframework.org/schema/context"
diff --git a/dspace/config/spring/api/discovery.xml b/dspace/config/spring/api/discovery.xml
index 1add0dcaa5..183b1e892d 100644
--- a/dspace/config/spring/api/discovery.xml
+++ b/dspace/config/spring/api/discovery.xml
@@ -1,13 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    The contents of this file are subject to the license and copyright
-    detailed in the LICENSE and NOTICE files at the root of the source
-    tree and available online at
-
-    http://www.dspace.org/license/
-
--->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:context="http://www.springframework.org/schema/context"
diff --git a/dspace/config/spring/api/identifier-service.xml b/dspace/config/spring/api/identifier-service.xml
index 4af6802305..d9a500ec36 100644
--- a/dspace/config/spring/api/identifier-service.xml
+++ b/dspace/config/spring/api/identifier-service.xml
@@ -1,13 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2002-2010, DuraSpace.  All rights reserved
-    Licensed under the DuraSpace License.
-
-    A copy of the DuraSpace License has been included in this
-    distribution and is available at: http://www.dspace.org/license
-
--->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
diff --git a/dspace/config/spring/api/item-marking.xml b/dspace/config/spring/api/item-marking.xml
index ee52ce4217..57fa6a5718 100644
--- a/dspace/config/spring/api/item-marking.xml
+++ b/dspace/config/spring/api/item-marking.xml
@@ -1,13 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    The contents of this file are subject to the license and copyright
-    detailed in the LICENSE and NOTICE files at the root of the source
-    tree and available online at
-
-    http://www.dspace.org/license/
-
--->
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:context="http://www.springframework.org/schema/context"
diff --git a/dspace/config/spring/api/orcid-authority-services.xml b/dspace/config/spring/api/orcid-authority-services.xml
index 9cfb74bac1..80c5cd1115 100644
--- a/dspace/config/spring/api/orcid-authority-services.xml
+++ b/dspace/config/spring/api/orcid-authority-services.xml
@@ -1,13 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2002-2010, DuraSpace.  All rights reserved
-    Licensed under the DuraSpace License.
-
-    A copy of the DuraSpace License has been included in this
-    distribution and is available at: http://www.dspace.org/license
-
--->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:context="http://www.springframework.org/schema/context"
diff --git a/dspace/config/spring/api/requestitem.xml b/dspace/config/spring/api/requestitem.xml
index 577e937102..cd18add16d 100644
--- a/dspace/config/spring/api/requestitem.xml
+++ b/dspace/config/spring/api/requestitem.xml
@@ -1,13 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    The contents of this file are subject to the license and copyright
-    detailed in the LICENSE and NOTICE files at the root of the source
-    tree and available online at
-
-    http://www.dspace.org/license/
-
--->
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:context="http://www.springframework.org/schema/context"
diff --git a/dspace/config/spring/api/sherpa.xml b/dspace/config/spring/api/sherpa.xml
index 78cfbd3754..fb9e31b9a0 100644
--- a/dspace/config/spring/api/sherpa.xml
+++ b/dspace/config/spring/api/sherpa.xml
@@ -1,13 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    The contents of this file are subject to the license and copyright
-    detailed in the LICENSE and NOTICE files at the root of the source
-    tree and available online at
-
-    http://www.dspace.org/license/
-
--->
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:context="http://www.springframework.org/schema/context"
diff --git a/dspace/config/spring/api/versioning-service.xml b/dspace/config/spring/api/versioning-service.xml
index 2644b3106c..ac80c15bed 100644
--- a/dspace/config/spring/api/versioning-service.xml
+++ b/dspace/config/spring/api/versioning-service.xml
@@ -1,13 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2002-2010, DuraSpace.  All rights reserved
-    Licensed under the DuraSpace License.
-
-    A copy of the DuraSpace License has been included in this
-    distribution and is available at: http://www.dspace.org/license
-
--->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.springframework.org/schema/beans