From b739d4c905ce7c59f056453aff8c80d012ce334e Mon Sep 17 00:00:00 2001
From: Tim Olsen <tim@deck5consulting.com>
Date: Mon, 4 Apr 2016 13:08:15 -0500
Subject: [PATCH] XNAT-4141: Migrate schema into dependent projects
 (xnat-data-plugin and core)

---
 .gitignore                                    |    1 +
 .../java/org/nrg/xnat/archive/Rename.java     |    6 +-
 .../schemas/assessments/assessments.xsd       |  884 ----
 .../xnat_a_scidResearchData_display.xml       | 1223 -----
 ...at_a_sideEffectsPittsburghData_display.xml |  287 --
 .../display/xnat_a_updrs3Data_display.xml     |  399 --
 .../display/xnat_a_ybocsData_display.xml      |  271 --
 .../display/xnat_a_ygtssData_display.xml      |  263 --
 src/main/webapp/schemas/birn/birnprov.xsd     |  111 -
 src/main/webapp/schemas/catalog/catalog.xsd   |  130 -
 .../catalog/display/cat_catalog_display.xml   |   28 -
 .../display/cat_dcmCatalog_display.xml        |   78 -
 .../catalog/display/cat_entry_display.xml     |   83 -
 src/main/webapp/schemas/ext/ext.xsd           |  333 --
 src/main/webapp/schemas/pipeline/build.xsd    |   77 -
 .../pipeline/display/workflowData_display.xml |  143 -
 .../webapp/schemas/pipeline/repository.xsd    |   83 -
 src/main/webapp/schemas/pipeline/workflow.xsd |  209 -
 src/main/webapp/schemas/project/project.xsd   |  368 --
 .../scr_screeningAssessment_display.xml       |  132 -
 .../schemas/screening/screeningAssessment.xsd |   58 -
 src/main/webapp/schemas/search/search.xsd     |  178 -
 .../display/element_security_display.xml      |    1 -
 .../security/display/role_type_display.xml    |    1 -
 .../schemas/security/display/user_display.xml |  125 -
 .../display/xdat_infoEntry_display.xml        |   43 -
 .../display/xdat_newsEntry_display.xml        |   43 -
 .../display/xdat_stored_search_display.xml    |   51 -
 .../display/xdat_userGroup_display.xml        |    1 -
 src/main/webapp/schemas/security/security.xsd |  865 ----
 .../display/val_protocolData_display.xml      |  116 -
 .../schemas/validation/protocolValidation.xsd |  182 -
 src/main/webapp/schemas/xdat/PlexiViewer.xsd  |  190 -
 src/main/webapp/schemas/xdat/display.xsd      |  322 --
 src/main/webapp/schemas/xdat/instance.xsd     |   89 -
 src/main/webapp/schemas/xdat/xdat.xsd         |  213 -
 .../xnat/display/mrSessionData_display.xml    |  365 --
 .../xnat/display/subjectData_display.xml      |  198 -
 .../xnat/display/xnat_crScanData_display.xml  |   98 -
 .../display/xnat_crSessionData_display.xml    |  135 -
 .../xnat/display/xnat_ctScanData_display.xml  |  278 --
 .../display/xnat_ctSessionData_display.xml    |  180 -
 .../xnat_dx3DCraniofacialScanData_display.xml |   98 -
 ...at_dx3DCraniofacialSessionData_display.xml |  135 -
 .../xnat/display/xnat_dxScanData_display.xml  |   98 -
 .../display/xnat_dxSessionData_display.xml    |  135 -
 .../xnat/display/xnat_ecgScanData_display.xml |   98 -
 .../display/xnat_ecgSessionData_display.xml   |  135 -
 .../xnat/display/xnat_eegScanData_display.xml |   98 -
 .../display/xnat_eegSessionData_display.xml   |  135 -
 .../xnat/display/xnat_epsScanData_display.xml |   98 -
 .../display/xnat_epsSessionData_display.xml   |  135 -
 .../xnat/display/xnat_esScanData_display.xml  |   98 -
 .../display/xnat_esSessionData_display.xml    |  135 -
 .../xnat/display/xnat_esvScanData_display.xml |   98 -
 .../display/xnat_esvSessionData_display.xml   |  135 -
 .../xnat_fieldDefinitionGroup_display.xml     |   38 -
 .../xnat/display/xnat_genericData_display.xml |  108 -
 .../xnat/display/xnat_gmScanData_display.xml  |   98 -
 .../display/xnat_gmSessionData_display.xml    |  135 -
 .../xnat/display/xnat_gmvScanData_display.xml |   98 -
 .../display/xnat_gmvSessionData_display.xml   |  135 -
 .../xnat/display/xnat_hdScanData_display.xml  |   98 -
 .../display/xnat_hdSessionData_display.xml    |  135 -
 .../display/xnat_investigatorData_display.xml |    1 -
 .../xnat/display/xnat_ioScanData_display.xml  |   98 -
 .../display/xnat_ioSessionData_display.xml    |  135 -
 .../xnat/display/xnat_megScanData_display.xml |   98 -
 .../display/xnat_megSessionData_display.xml   |  135 -
 .../xnat/display/xnat_mgScanData_display.xml  |   98 -
 .../display/xnat_mgSessionData_display.xml    |  135 -
 .../xnat/display/xnat_mrScanData_display.xml  |  268 --
 .../xnat/display/xnat_mrsScanData_display.xml |   98 -
 .../xnat/display/xnat_nmScanData_display.xml  |   98 -
 .../display/xnat_nmSessionData_display.xml    |  135 -
 .../xnat/display/xnat_opScanData_display.xml  |   98 -
 .../display/xnat_opSessionData_display.xml    |  135 -
 .../xnat/display/xnat_optScanData_display.xml |  158 -
 .../display/xnat_optSessionData_display.xml   |  135 -
 .../xnat_otherDicomScanData_display.xml       |   98 -
 .../xnat_otherDicomSessionData_display.xml    |  135 -
 .../xnat/display/xnat_pVisitData_display.xml  |  182 -
 .../xnat/display/xnat_petScanData_display.xml |  418 --
 .../display/xnat_petSessionData_display.xml   |  294 --
 .../display/xnat_petmrSessionData_display.xml |  343 --
 .../xnat/display/xnat_projectData_display.xml |  277 --
 .../display/xnat_qcAssessmentData_display.xml |  156 -
 .../xnat_qcManualAssessorData_display.xml     |  180 -
 .../xnat_reconstructedImageData_display.xml   |   33 -
 .../display/xnat_regionResource_display.xml   |   38 -
 .../display/xnat_resourceCatalog_display.xml  |   58 -
 .../xnat/display/xnat_rfScanData_display.xml  |   98 -
 .../display/xnat_rfSessionData_display.xml    |  135 -
 .../display/xnat_rtImageScanData_display.xml  |   98 -
 .../display/xnat_rtSessionData_display.xml    |  135 -
 .../xnat/display/xnat_scScanData_display.xml  |   98 -
 .../xnat/display/xnat_segScanData_display.xml |   98 -
 .../xnat/display/xnat_smScanData_display.xml  |   98 -
 .../display/xnat_smSessionData_display.xml    |  135 -
 .../xnat/display/xnat_srScanData_display.xml  |   98 -
 .../display/xnat_srSessionData_display.xml    |  135 -
 .../xnat_subjectVariablesData_display.xml     |  135 -
 .../xnat/display/xnat_usScanData_display.xml  |   98 -
 .../display/xnat_usSessionData_display.xml    |  135 -
 .../xnat_voiceAudioScanData_display.xml       |   98 -
 .../display/xnat_xa3DScanData_display.xml     |   98 -
 .../display/xnat_xa3DSessionData_display.xml  |  135 -
 .../xnat/display/xnat_xaScanData_display.xml  |  143 -
 .../display/xnat_xaSessionData_display.xml    |  135 -
 .../xnat/display/xnat_xcScanData_display.xml  |   98 -
 .../display/xnat_xcSessionData_display.xml    |  135 -
 .../xnat/display/xnat_xcvScanData_display.xml |   98 -
 .../display/xnat_xcvSessionData_display.xml   |  135 -
 src/main/webapp/schemas/xnat/xnat.xsd         | 4179 -----------------
 114 files changed, 4 insertions(+), 22100 deletions(-)
 delete mode 100644 src/main/webapp/schemas/assessments/assessments.xsd
 delete mode 100644 src/main/webapp/schemas/assessments/display/xnat_a_scidResearchData_display.xml
 delete mode 100644 src/main/webapp/schemas/assessments/display/xnat_a_sideEffectsPittsburghData_display.xml
 delete mode 100644 src/main/webapp/schemas/assessments/display/xnat_a_updrs3Data_display.xml
 delete mode 100644 src/main/webapp/schemas/assessments/display/xnat_a_ybocsData_display.xml
 delete mode 100644 src/main/webapp/schemas/assessments/display/xnat_a_ygtssData_display.xml
 delete mode 100644 src/main/webapp/schemas/birn/birnprov.xsd
 delete mode 100644 src/main/webapp/schemas/catalog/catalog.xsd
 delete mode 100644 src/main/webapp/schemas/catalog/display/cat_catalog_display.xml
 delete mode 100644 src/main/webapp/schemas/catalog/display/cat_dcmCatalog_display.xml
 delete mode 100644 src/main/webapp/schemas/catalog/display/cat_entry_display.xml
 delete mode 100644 src/main/webapp/schemas/ext/ext.xsd
 delete mode 100644 src/main/webapp/schemas/pipeline/build.xsd
 delete mode 100644 src/main/webapp/schemas/pipeline/display/workflowData_display.xml
 delete mode 100644 src/main/webapp/schemas/pipeline/repository.xsd
 delete mode 100644 src/main/webapp/schemas/pipeline/workflow.xsd
 delete mode 100644 src/main/webapp/schemas/project/project.xsd
 delete mode 100644 src/main/webapp/schemas/screening/display/scr_screeningAssessment_display.xml
 delete mode 100644 src/main/webapp/schemas/screening/screeningAssessment.xsd
 delete mode 100644 src/main/webapp/schemas/search/search.xsd
 delete mode 100644 src/main/webapp/schemas/security/display/element_security_display.xml
 delete mode 100644 src/main/webapp/schemas/security/display/role_type_display.xml
 delete mode 100644 src/main/webapp/schemas/security/display/user_display.xml
 delete mode 100644 src/main/webapp/schemas/security/display/xdat_infoEntry_display.xml
 delete mode 100644 src/main/webapp/schemas/security/display/xdat_newsEntry_display.xml
 delete mode 100644 src/main/webapp/schemas/security/display/xdat_stored_search_display.xml
 delete mode 100644 src/main/webapp/schemas/security/display/xdat_userGroup_display.xml
 delete mode 100644 src/main/webapp/schemas/security/security.xsd
 delete mode 100644 src/main/webapp/schemas/validation/display/val_protocolData_display.xml
 delete mode 100644 src/main/webapp/schemas/validation/protocolValidation.xsd
 delete mode 100644 src/main/webapp/schemas/xdat/PlexiViewer.xsd
 delete mode 100644 src/main/webapp/schemas/xdat/display.xsd
 delete mode 100644 src/main/webapp/schemas/xdat/instance.xsd
 delete mode 100644 src/main/webapp/schemas/xdat/xdat.xsd
 delete mode 100644 src/main/webapp/schemas/xnat/display/mrSessionData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/subjectData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_crScanData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_crSessionData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_ctScanData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_ctSessionData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_dx3DCraniofacialScanData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_dx3DCraniofacialSessionData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_dxScanData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_dxSessionData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_ecgScanData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_ecgSessionData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_eegScanData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_eegSessionData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_epsScanData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_epsSessionData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_esScanData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_esSessionData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_esvScanData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_esvSessionData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_fieldDefinitionGroup_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_genericData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_gmScanData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_gmSessionData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_gmvScanData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_gmvSessionData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_hdScanData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_hdSessionData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_investigatorData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_ioScanData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_ioSessionData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_megScanData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_megSessionData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_mgScanData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_mgSessionData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_mrScanData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_mrsScanData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_nmScanData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_nmSessionData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_opScanData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_opSessionData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_optScanData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_optSessionData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_otherDicomScanData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_otherDicomSessionData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_pVisitData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_petScanData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_petSessionData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_petmrSessionData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_projectData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_qcAssessmentData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_qcManualAssessorData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_reconstructedImageData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_regionResource_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_resourceCatalog_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_rfScanData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_rfSessionData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_rtImageScanData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_rtSessionData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_scScanData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_segScanData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_smScanData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_smSessionData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_srScanData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_srSessionData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_subjectVariablesData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_usScanData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_usSessionData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_voiceAudioScanData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_xa3DScanData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_xa3DSessionData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_xaScanData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_xaSessionData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_xcScanData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_xcSessionData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_xcvScanData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/display/xnat_xcvSessionData_display.xml
 delete mode 100644 src/main/webapp/schemas/xnat/xnat.xsd

diff --git a/.gitignore b/.gitignore
index 59586d5d..e9537f4d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ InstanceSettings.xml
 /bin/
 .classpath
 .project
+.settings/
diff --git a/src/main/java/org/nrg/xnat/archive/Rename.java b/src/main/java/org/nrg/xnat/archive/Rename.java
index 1a78d2a2..9b58c87d 100644
--- a/src/main/java/org/nrg/xnat/archive/Rename.java
+++ b/src/main/java/org/nrg/xnat/archive/Rename.java
@@ -219,7 +219,7 @@ public class Rename  implements Callable<File>{
 				
 				this.updateStep(workflow, setStep(STEP.EXECUTE_SQL));
 				//Execute SQL
-				executeSQL(cache,user,XFT.buildLogFileName(i));
+				executeSQL(cache,user);
 
 				this.updateStep(workflow, setStep(STEP.DELETE_OLD_DIR));
 				//if successful, move old directory to cache)
@@ -407,8 +407,8 @@ public class Rename  implements Callable<File>{
 	 * @return
 	 * @throws Exception 
 	 */
-	protected static void executeSQL(final DBItemCache cache, final UserI user, final String logFileName) throws Exception{
-		DBAction.executeCache(cache, user, user.getDBName(), logFileName);
+	protected static void executeSQL(final DBItemCache cache, final UserI user) throws Exception{
+		DBAction.executeCache(cache, user, user.getDBName());
 	}
 	
 	/**
diff --git a/src/main/webapp/schemas/assessments/assessments.xsd b/src/main/webapp/schemas/assessments/assessments.xsd
deleted file mode 100644
index 0a0107f4..00000000
--- a/src/main/webapp/schemas/assessments/assessments.xsd
+++ /dev/null
@@ -1,884 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSpy v2007 sp2 (http://www.altova.com) by Washington University Radiolodical Science (Washington University in St. Louis) -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xnat="http://nrg.wustl.edu/xnat" xmlns:xnat_a="http://nrg.wustl.edu/xnat_assessments" targetNamespace="http://nrg.wustl.edu/xnat_assessments" elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<xs:import namespace="http://nrg.wustl.edu/xnat" schemaLocation="../xnat/xnat.xsd"/>
-	<xs:element name="SideEffectsPittsburgh" type="xnat_a:sideEffectsPittsburghData">
-		<xs:annotation>
-			<xs:documentation>Pittsburgh Side Effects Scale</xs:documentation>
-		</xs:annotation>
-	</xs:element>
-	<xs:element name="YBOCS" type="xnat_a:ybocsData">
-		<xs:annotation>
-			<xs:documentation>Yale-Brown Obsessive-Compusive Scale</xs:documentation>
-		</xs:annotation>
-	</xs:element>
-	<xs:element name="YGTSS" type="xnat_a:ygtssData">
-		<xs:annotation>
-			<xs:documentation>Yale Global Tic Severity Scale</xs:documentation>
-		</xs:annotation>
-	</xs:element>
-	<xs:element name="UPDRS3" type="xnat_a:updrs3Data">
-		<xs:annotation>
-			<xs:documentation>Unified Parkinson Disease Rating Scale</xs:documentation>
-		</xs:annotation>
-	</xs:element>
-	<xs:element name="SCID" type="xnat_a:scidResearchData">
-		<xs:annotation>
-			<xs:documentation>Structured Clinical Interview for DSM Disorders</xs:documentation>
-		</xs:annotation>
-	</xs:element>
-	<xs:complexType name="sideEffectsPittsburghData">
-		<xs:annotation>
-			<xs:documentation>Pittsburgh Side Effects Scale</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:subjectAssessorData">
-				<xs:sequence>
-					<xs:element name="motorTics" minOccurs="0">
-						<xs:simpleType>
-							<xs:restriction base="xs:integer">
-								<xs:minInclusive value="0"/>
-								<xs:maxInclusive value="3"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element name="buccal_lingualMovements" minOccurs="0">
-						<xs:simpleType>
-							<xs:restriction base="xs:integer">
-								<xs:minInclusive value="0"/>
-								<xs:maxInclusive value="3"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element name="picking_skin_fingers_nails_lip" minOccurs="0">
-						<xs:simpleType>
-							<xs:restriction base="xs:integer">
-								<xs:minInclusive value="0"/>
-								<xs:maxInclusive value="3"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element name="worried_anxious" minOccurs="0">
-						<xs:simpleType>
-							<xs:restriction base="xs:integer">
-								<xs:minInclusive value="0"/>
-								<xs:maxInclusive value="3"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element name="dull_tired_listless" minOccurs="0">
-						<xs:simpleType>
-							<xs:restriction base="xs:integer">
-								<xs:minInclusive value="0"/>
-								<xs:maxInclusive value="3"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element name="sedation" minOccurs="0">
-						<xs:simpleType>
-							<xs:restriction base="xs:integer">
-								<xs:minInclusive value="0"/>
-								<xs:maxInclusive value="3"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element name="stomachache" minOccurs="0">
-						<xs:simpleType>
-							<xs:restriction base="xs:integer">
-								<xs:minInclusive value="0"/>
-								<xs:maxInclusive value="3"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element name="nausea_vomiting" minOccurs="0">
-						<xs:simpleType>
-							<xs:restriction base="xs:integer">
-								<xs:minInclusive value="0"/>
-								<xs:maxInclusive value="3"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element name="crabby_irritable" minOccurs="0">
-						<xs:simpleType>
-							<xs:restriction base="xs:integer">
-								<xs:minInclusive value="0"/>
-								<xs:maxInclusive value="3"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element name="tearful_sad_depressed" minOccurs="0">
-						<xs:simpleType>
-							<xs:restriction base="xs:integer">
-								<xs:minInclusive value="0"/>
-								<xs:maxInclusive value="3"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element name="hallucinations" minOccurs="0">
-						<xs:simpleType>
-							<xs:restriction base="xs:integer">
-								<xs:minInclusive value="0"/>
-								<xs:maxInclusive value="3"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element name="troubleSleeping" minOccurs="0">
-						<xs:simpleType>
-							<xs:restriction base="xs:integer">
-								<xs:minInclusive value="0"/>
-								<xs:maxInclusive value="3"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element name="lossOfAppetite" minOccurs="0">
-						<xs:simpleType>
-							<xs:restriction base="xs:integer">
-								<xs:minInclusive value="0"/>
-								<xs:maxInclusive value="3"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element name="troubleConcentrating_distractible" minOccurs="0">
-						<xs:simpleType>
-							<xs:restriction base="xs:integer">
-								<xs:minInclusive value="0"/>
-								<xs:maxInclusive value="3"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element name="dizziness_lightheadedness" minOccurs="0">
-						<xs:simpleType>
-							<xs:restriction base="xs:integer">
-								<xs:minInclusive value="0"/>
-								<xs:maxInclusive value="3"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element name="headaches" minOccurs="0">
-						<xs:simpleType>
-							<xs:restriction base="xs:integer">
-								<xs:minInclusive value="0"/>
-								<xs:maxInclusive value="3"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element name="socialWithdrawal" minOccurs="0">
-						<xs:simpleType>
-							<xs:restriction base="xs:integer">
-								<xs:minInclusive value="0"/>
-								<xs:maxInclusive value="3"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element name="dryMouth" minOccurs="0">
-						<xs:simpleType>
-							<xs:restriction base="xs:integer">
-								<xs:minInclusive value="0"/>
-								<xs:maxInclusive value="3"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element name="palpitations" minOccurs="0">
-						<xs:simpleType>
-							<xs:restriction base="xs:integer">
-								<xs:minInclusive value="0"/>
-								<xs:maxInclusive value="3"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="ybocsData">
-		<xs:annotation>
-			<xs:documentation>Yale-Brown Obsessive Compulsive Scale</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:subjectAssessorData">
-				<xs:sequence>
-					<xs:element name="currentOrWorstEver" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Does this entry represent current or worst ever symptoms?</xs:documentation>
-						</xs:annotation>
-						<xs:simpleType>
-							<xs:restriction base="xs:string">
-								<xs:enumeration value="current"/>
-								<xs:enumeration value="worst ever"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element name="timeOccupiedWithThoughts" minOccurs="0">
-						<xs:simpleType>
-							<xs:restriction base="xs:integer">
-								<xs:minInclusive value="0"/>
-								<xs:maxInclusive value="4"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element name="thoughtsInterfereFunctioning" minOccurs="0">
-						<xs:simpleType>
-							<xs:restriction base="xs:integer">
-								<xs:minInclusive value="0"/>
-								<xs:maxInclusive value="4"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element name="distressCaused" minOccurs="0">
-						<xs:simpleType>
-							<xs:restriction base="xs:integer">
-								<xs:minInclusive value="0"/>
-								<xs:maxInclusive value="4"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element name="effortToResistThoughts" minOccurs="0">
-						<xs:simpleType>
-							<xs:restriction base="xs:integer">
-								<xs:minInclusive value="0"/>
-								<xs:maxInclusive value="4"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element name="controlOverThoughts" minOccurs="0">
-						<xs:simpleType>
-							<xs:restriction base="xs:integer">
-								<xs:minInclusive value="0"/>
-								<xs:maxInclusive value="4"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element name="timePerforming" minOccurs="0">
-						<xs:simpleType>
-							<xs:restriction base="xs:integer">
-								<xs:minInclusive value="0"/>
-								<xs:maxInclusive value="4"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element name="behaviorsInterfereFunctioning" minOccurs="0">
-						<xs:simpleType>
-							<xs:restriction base="xs:integer">
-								<xs:minInclusive value="0"/>
-								<xs:maxInclusive value="4"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element name="feelingIfPrevented" minOccurs="0">
-						<xs:simpleType>
-							<xs:restriction base="xs:integer">
-								<xs:minInclusive value="0"/>
-								<xs:maxInclusive value="4"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element name="effortToResistBehaviors" minOccurs="0">
-						<xs:simpleType>
-							<xs:restriction base="xs:integer">
-								<xs:minInclusive value="0"/>
-								<xs:maxInclusive value="4"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element name="behaviorDriveStrength" minOccurs="0">
-						<xs:simpleType>
-							<xs:restriction base="xs:integer">
-								<xs:minInclusive value="0"/>
-								<xs:maxInclusive value="4"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element name="untilJustRight" type="xs:boolean" minOccurs="0"/>
-					<xs:element name="untilJustRightAwareness" type="xs:string" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Mental, physical, somewhere in between</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="untilJustRightPerceptions" type="xs:string" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>How things look, how things feel, how things sound</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="whenStartUntilJustRight" type="xs:string" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Before starting, at start, during</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="frequencyUntilJustRight" minOccurs="0">
-						<xs:simpleType>
-							<xs:restriction base="xs:string">
-								<xs:enumeration value="frequently"/>
-								<xs:enumeration value="occasionally"/>
-								<xs:enumeration value="hardly ever"/>
-								<xs:enumeration value="never"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element name="firstUntilJustRightAge" type="xs:float" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="ygtssData">
-		<xs:annotation>
-			<xs:documentation>Yale Global Tic Severity Scale</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:subjectAssessorData">
-				<xs:sequence>
-					<xs:element name="filledOutBy" type="xs:string" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>self, parent, KJB, BS, etc.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="period" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>current or worst ever</xs:documentation>
-						</xs:annotation>
-						<xs:simpleType>
-							<xs:restriction base="xs:string">
-								<xs:enumeration value="current"/>
-								<xs:enumeration value="worst ever"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element name="worstEverAge" type="xs:float" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>only if worst ever</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="motor" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="number" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>0 = none; 1 = single tic; 2 = 2-5 discrete tics; 3 = >5 discrete tics; 4 = at least one orchestrated pattern; 5 = >2 patterns</xs:documentation>
-									</xs:annotation>
-									<xs:simpleType>
-										<xs:restriction base="xs:integer">
-											<xs:minInclusive value="0"/>
-											<xs:maxInclusive value="5"/>
-										</xs:restriction>
-									</xs:simpleType>
-								</xs:element>
-								<xs:element name="frequency" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>0 = none; 1 = rarely; 2 = occasionally; 3 = frequently; 4 = almost always; 5 = always</xs:documentation>
-									</xs:annotation>
-									<xs:simpleType>
-										<xs:restriction base="xs:integer">
-											<xs:minInclusive value="0"/>
-											<xs:maxInclusive value="5"/>
-										</xs:restriction>
-									</xs:simpleType>
-								</xs:element>
-								<xs:element name="intensity" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>0 = absent; 1 = minimal; 2 = mild; 3 = moderate; 4 = marked; 5 = severe</xs:documentation>
-									</xs:annotation>
-									<xs:simpleType>
-										<xs:restriction base="xs:integer">
-											<xs:minInclusive value="0"/>
-											<xs:maxInclusive value="5"/>
-										</xs:restriction>
-									</xs:simpleType>
-								</xs:element>
-								<xs:element name="complexity" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>0 = none; 1 = borderline; 2 = mild; 3 = moderate; 4 = marked; 5 = severe</xs:documentation>
-									</xs:annotation>
-									<xs:simpleType>
-										<xs:restriction base="xs:integer">
-											<xs:minInclusive value="0"/>
-											<xs:maxInclusive value="5"/>
-										</xs:restriction>
-									</xs:simpleType>
-								</xs:element>
-								<xs:element name="interference" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>0 = none; 1 = minimal; 2 = mild; 3 = moderate; 4 = marked; 5 = severe</xs:documentation>
-									</xs:annotation>
-									<xs:simpleType>
-										<xs:restriction base="xs:integer">
-											<xs:minInclusive value="0"/>
-											<xs:maxInclusive value="5"/>
-										</xs:restriction>
-									</xs:simpleType>
-								</xs:element>
-								<xs:element name="inventory" type="xs:string" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>list of tics during week being rated</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="phonic" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="number" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>0 = none; 1 = single tic; 2 = 2-5 discrete tics; 3 = >5 discrete tics; 4 = at least one orchestrated pattern; 5 = >2 patterns</xs:documentation>
-									</xs:annotation>
-									<xs:simpleType>
-										<xs:restriction base="xs:integer">
-											<xs:minInclusive value="0"/>
-											<xs:maxInclusive value="5"/>
-										</xs:restriction>
-									</xs:simpleType>
-								</xs:element>
-								<xs:element name="frequency" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>0 = none; 1 = rarely; 2 = occasionally; 3 = frequently; 4 = almost always; 5 = always</xs:documentation>
-									</xs:annotation>
-									<xs:simpleType>
-										<xs:restriction base="xs:integer">
-											<xs:minInclusive value="0"/>
-											<xs:maxInclusive value="5"/>
-										</xs:restriction>
-									</xs:simpleType>
-								</xs:element>
-								<xs:element name="intensity" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>0 = absent; 1 = minimal; 2 = mild; 3 = moderate; 4 = marked; 5 = severe</xs:documentation>
-									</xs:annotation>
-									<xs:simpleType>
-										<xs:restriction base="xs:integer">
-											<xs:minInclusive value="0"/>
-											<xs:maxInclusive value="5"/>
-										</xs:restriction>
-									</xs:simpleType>
-								</xs:element>
-								<xs:element name="complexity" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>0 = none; 1 = borderline; 2 = mild; 3 = moderate; 4 = marked; 5 = severe</xs:documentation>
-									</xs:annotation>
-									<xs:simpleType>
-										<xs:restriction base="xs:integer">
-											<xs:minInclusive value="0"/>
-											<xs:maxInclusive value="5"/>
-										</xs:restriction>
-									</xs:simpleType>
-								</xs:element>
-								<xs:element name="interference" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>0 = none; 1 = minimal; 2 = mild; 3 = moderate; 4 = marked; 5 = severe</xs:documentation>
-									</xs:annotation>
-									<xs:simpleType>
-										<xs:restriction base="xs:integer">
-											<xs:minInclusive value="0"/>
-											<xs:maxInclusive value="5"/>
-										</xs:restriction>
-									</xs:simpleType>
-								</xs:element>
-								<xs:element name="inventory" type="xs:string" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>list of tics during week being rated</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="impairment" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>0 = none; 10 = minimal; 20 = mild; 30 = moderate; 40 = marked; 50 = severe</xs:documentation>
-						</xs:annotation>
-						<xs:simpleType>
-							<xs:restriction base="xs:integer">
-								<xs:minInclusive value="0"/>
-								<xs:maxInclusive value="50"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="updrs3Data">
-		<xs:annotation>
-			<xs:documentation>Unified Parkinson's Disease Rating Scale</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:subjectAssessorData">
-				<xs:sequence>
-					<xs:element name="inScanner" type="xs:boolean" minOccurs="0"/>
-					<xs:element name="clicker" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="right" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>Right hand click count (usually best of 2)</xs:documentation>
-									</xs:annotation>
-									<xs:simpleType>
-										<xs:restriction base="xs:integer">
-											<xs:minInclusive value="0"/>
-										</xs:restriction>
-									</xs:simpleType>
-								</xs:element>
-								<xs:element name="left" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>Left hand click count (usually best of 2)</xs:documentation>
-									</xs:annotation>
-									<xs:simpleType>
-										<xs:restriction base="xs:integer">
-											<xs:minInclusive value="0"/>
-										</xs:restriction>
-									</xs:simpleType>
-								</xs:element>
-								<xs:element name="interval">
-									<xs:annotation>
-										<xs:documentation>Number of seconds allowed for each clicker rating</xs:documentation>
-									</xs:annotation>
-									<xs:simpleType>
-										<xs:restriction base="xs:integer">
-											<xs:minInclusive value="0"/>
-										</xs:restriction>
-									</xs:simpleType>
-								</xs:element>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="tremorRest" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="face" minOccurs="0"/>
-								<xs:element name="rue" minOccurs="0"/>
-								<xs:element name="lue" minOccurs="0"/>
-								<xs:element name="rle" minOccurs="0"/>
-								<xs:element name="lle" minOccurs="0"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="rigidity" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="neck" minOccurs="0"/>
-								<xs:element name="rue" minOccurs="0"/>
-								<xs:element name="lue" minOccurs="0"/>
-								<xs:element name="rle" minOccurs="0"/>
-								<xs:element name="lle" minOccurs="0"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="handMovementsGrip" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="right" type="xs:integer" minOccurs="0"/>
-								<xs:element name="left" type="xs:integer" minOccurs="0"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="facialExpression" type="xs:integer" minOccurs="0"/>
-					<xs:element name="gait" type="xs:integer" minOccurs="0"/>
-					<xs:element name="speech" type="xs:integer" minOccurs="0"/>
-					<xs:element name="writing" type="xs:integer" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>not in UPDRS section III (?)</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="ariseFromChair" type="xs:integer" minOccurs="0"/>
-					<xs:element name="actionPosturalTremor" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="right" type="xs:integer" minOccurs="0"/>
-								<xs:element name="left" type="xs:integer" minOccurs="0"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="handsRAM" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="right" type="xs:integer" minOccurs="0"/>
-								<xs:element name="left" type="xs:integer" minOccurs="0"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="fingerTaps" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="right" type="xs:integer" minOccurs="0"/>
-								<xs:element name="left" type="xs:integer" minOccurs="0"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="posture" type="xs:integer" minOccurs="0"/>
-					<xs:element name="posturalStability" type="xs:integer" minOccurs="0"/>
-					<xs:element name="footTaps" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="right" type="xs:integer" minOccurs="0"/>
-								<xs:element name="left" type="xs:integer" minOccurs="0"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="bodyBradykinesiaHypokinesia" type="xs:integer" minOccurs="0"/>
-					<xs:element name="problem" type="xs:boolean" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="scidResearchData">
-		<xs:annotation>
-			<xs:documentation>Structured Clinical Interview for DSM-III-R (research version)</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:subjectAssessorData">
-				<xs:sequence>
-					<xs:element name="administrator" type="xs:string" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Person administering the test</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="moodEpisodes" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="currentMajorDepressiveEpisode" type="xs:integer" minOccurs="0"/>
-								<xs:element name="pastMajorDepressiveEpisode" type="xs:integer" minOccurs="0"/>
-								<xs:element name="currentManicEpisode" type="xs:integer" minOccurs="0"/>
-								<xs:element name="pastManicEpisode" type="xs:integer" minOccurs="0"/>
-								<xs:element name="currentHypomanicEpisode" type="xs:integer" minOccurs="0"/>
-								<xs:element name="pastHypomanicEpisode" type="xs:integer" minOccurs="0"/>
-								<xs:element name="currentDysthmicEpisode" type="xs:integer" minOccurs="0"/>
-								<xs:element name="currentMoodDisorderDueToMedicalCondition" type="xs:integer" minOccurs="0"/>
-								<xs:element name="pastMoodDisorderDueToMedicalCondition" type="xs:integer" minOccurs="0"/>
-								<xs:element name="currentSubstanceInducedMoodDisorder" type="xs:integer" minOccurs="0"/>
-								<xs:element name="pastSubstanceInducedMoodDisorder" type="xs:integer" minOccurs="0"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="psychoticSymptoms" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="currentDelusions" type="xs:integer" minOccurs="0"/>
-								<xs:element name="pastDelusions" type="xs:integer" minOccurs="0"/>
-								<xs:element name="currentHallucinations" type="xs:integer" minOccurs="0"/>
-								<xs:element name="pastHallucinations" type="xs:integer" minOccurs="0"/>
-								<xs:element name="currentDisorganizedSpeechBehavior" type="xs:integer" minOccurs="0"/>
-								<xs:element name="pastDisorganizedSpeechBehavior" type="xs:integer" minOccurs="0"/>
-								<xs:element name="currentCatatonicBehavior" type="xs:integer" minOccurs="0"/>
-								<xs:element name="pastCatatonicBehavior" type="xs:integer" minOccurs="0"/>
-								<xs:element name="currentNegativeSymptoms" type="xs:integer" minOccurs="0"/>
-								<xs:element name="pastNegativeSymptoms" type="xs:integer" minOccurs="0"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="psychoticDisorders" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="currentSchizophrenia" type="xs:integer" minOccurs="0"/>
-								<xs:element name="pastSchizophrenia" type="xs:integer" minOccurs="0"/>
-								<xs:element name="currentParanoidType" type="xs:integer" minOccurs="0"/>
-								<xs:element name="pastParanoidType" type="xs:integer" minOccurs="0"/>
-								<xs:element name="currentCatatonicType" type="xs:integer" minOccurs="0"/>
-								<xs:element name="pastCatatonicType" type="xs:integer" minOccurs="0"/>
-								<xs:element name="currentDisorganizedType" type="xs:integer" minOccurs="0"/>
-								<xs:element name="pastDisorganizedType" type="xs:integer" minOccurs="0"/>
-								<xs:element name="currentUndifferentiatedType" type="xs:integer" minOccurs="0"/>
-								<xs:element name="pastUndifferentiatedType" type="xs:integer" minOccurs="0"/>
-								<xs:element name="currentResidualType" type="xs:integer" minOccurs="0"/>
-								<xs:element name="pastResidualType" type="xs:integer" minOccurs="0"/>
-								<xs:element name="currentSchizophreniformDisorder" type="xs:integer" minOccurs="0"/>
-								<xs:element name="pastSchizophreniformDisorder" type="xs:integer" minOccurs="0"/>
-								<xs:element name="currentSchizoaffectiveDisorder" type="xs:integer" minOccurs="0"/>
-								<xs:element name="pastSchizoaffectiveDisorder" type="xs:integer" minOccurs="0"/>
-								<xs:element name="currentDelusionalDisorder" type="xs:integer" minOccurs="0"/>
-								<xs:element name="pastDelusionalDisorder" type="xs:integer" minOccurs="0"/>
-								<xs:element name="currentBriefPsychoticDisorder" type="xs:integer" minOccurs="0"/>
-								<xs:element name="pastBriefPsychoticDisorder" type="xs:integer" minOccurs="0"/>
-								<xs:element name="currentPsychoticDisorderDueToMedicalCondition" type="xs:integer" minOccurs="0"/>
-								<xs:element name="pastPsychoticDisorderDueToMedicalCondition" type="xs:integer" minOccurs="0"/>
-								<xs:element name="currentSubstanceInducedPsychoticDisorder" type="xs:integer" minOccurs="0"/>
-								<xs:element name="pastSubstanceInducedPsychoticDisorder" type="xs:integer" minOccurs="0"/>
-								<xs:element name="currentPsychoticDisorderNOS" type="xs:integer" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>not otherwise specified</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="pastPsychoticDisorderNOS" type="xs:integer" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>not otherwise specified</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="moodDisorders" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="currentBipolar1Disorder" type="xs:integer" minOccurs="0"/>
-								<xs:element name="pastBipolar1Disorder" type="xs:integer" minOccurs="0"/>
-								<xs:element name="currentBipolar2Disorder" type="xs:integer" minOccurs="0"/>
-								<xs:element name="pastBipolar2Disorder" type="xs:integer" minOccurs="0"/>
-								<xs:element name="currentOtherBipolarDisorder" type="xs:integer" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>cyclothymic disorder, bipolar disorder NOS</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="pastOtherBipolarDisorder" type="xs:integer" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>cyclothymic disorder, bipolar disorder NOS</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="currentMajorDepressiveDisorder" type="xs:integer" minOccurs="0"/>
-								<xs:element name="pastMajorDepressiveDisorder" type="xs:integer" minOccurs="0"/>
-								<xs:element name="currentDepressiveDisorderNOS" type="xs:integer" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>not otherwise specified</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="pastDepressiveDisorderNOS" type="xs:integer" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>not otherwise specified</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="substanceUseDisorders" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="currentAlcoholDependence" type="xs:integer" minOccurs="0"/>
-								<xs:element name="pastAlcoholDependence" type="xs:integer" minOccurs="0"/>
-								<xs:element name="currentAlcoholAbuse" type="xs:integer" minOccurs="0"/>
-								<xs:element name="pastAlcoholAbuse" type="xs:integer" minOccurs="0"/>
-								<xs:element name="currentAmphetamineDependence" type="xs:integer" minOccurs="0"/>
-								<xs:element name="pastAmphetamineDependence" type="xs:integer" minOccurs="0"/>
-								<xs:element name="currentAmphetamineAbuse" type="xs:integer" minOccurs="0"/>
-								<xs:element name="pastAmphetamineAbuse" type="xs:integer" minOccurs="0"/>
-								<xs:element name="currentCannabisDependence" type="xs:integer" minOccurs="0"/>
-								<xs:element name="pastCannabisDependence" type="xs:integer" minOccurs="0"/>
-								<xs:element name="currentCannabisAbuse" type="xs:integer" minOccurs="0"/>
-								<xs:element name="pastCannabisAbuse" type="xs:integer" minOccurs="0"/>
-								<xs:element name="currentCocaineDependence" type="xs:integer" minOccurs="0"/>
-								<xs:element name="pastCocaineDependence" type="xs:integer" minOccurs="0"/>
-								<xs:element name="currentCocaineAbuse" type="xs:integer" minOccurs="0"/>
-								<xs:element name="pastCocaineAbuse" type="xs:integer" minOccurs="0"/>
-								<xs:element name="currentHallucinogenDependence" type="xs:integer" minOccurs="0"/>
-								<xs:element name="pastHallucinogenDependence" type="xs:integer" minOccurs="0"/>
-								<xs:element name="currentHallucinogenAbuse" type="xs:integer" minOccurs="0"/>
-								<xs:element name="pastHallucinogenAbuse" type="xs:integer" minOccurs="0"/>
-								<xs:element name="currentOpioidDependence" type="xs:integer" minOccurs="0"/>
-								<xs:element name="pastOpioidDependence" type="xs:integer" minOccurs="0"/>
-								<xs:element name="currentOpioidAbuse" type="xs:integer" minOccurs="0"/>
-								<xs:element name="pastOpioidAbuse" type="xs:integer" minOccurs="0"/>
-								<xs:element name="currentPhencyclidineDependence" type="xs:integer" minOccurs="0"/>
-								<xs:element name="pastPhencyclidineDependence" type="xs:integer" minOccurs="0"/>
-								<xs:element name="currentPhencyclidineAbuse" type="xs:integer" minOccurs="0"/>
-								<xs:element name="pastPhencyclidineAbuse" type="xs:integer" minOccurs="0"/>
-								<xs:element name="currentSedativeHypnoticAnxiolyticDependence" type="xs:integer" minOccurs="0"/>
-								<xs:element name="pastSedativeHypnoticAnxiolyticDependence" type="xs:integer" minOccurs="0"/>
-								<xs:element name="currentSedativeHypnoticAnxiolyticAbuse" type="xs:integer" minOccurs="0"/>
-								<xs:element name="pastSedativeHypnoticAnxiolyticAbuse" type="xs:integer" minOccurs="0"/>
-								<xs:element name="currentPolysubstanceDependence" type="xs:integer" minOccurs="0"/>
-								<xs:element name="pastPolysubstanceDependence" type="xs:integer" minOccurs="0"/>
-								<xs:element name="currentOtherOrUnknownDependence" type="xs:integer" minOccurs="0"/>
-								<xs:element name="pastOtherOrUnknownDependence" type="xs:integer" minOccurs="0"/>
-								<xs:element name="currentOtherOrUnknownAbuse" type="xs:integer" minOccurs="0"/>
-								<xs:element name="pastOtherOrUnknownAbuse" type="xs:integer" minOccurs="0"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="anxietyDisorders" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="currentPanicWithAgoraphobia" type="xs:integer" minOccurs="0"/>
-								<xs:element name="pastPanicWithAgoraphobia" type="xs:integer" minOccurs="0"/>
-								<xs:element name="currentPanicWithoutAgoraphobia" type="xs:integer" minOccurs="0"/>
-								<xs:element name="pastPanicWithoutAgoraphobia" type="xs:integer" minOccurs="0"/>
-								<xs:element name="currentAgoraphobiaWithoutPanicHx" type="xs:integer" minOccurs="0"/>
-								<xs:element name="pastAgoraphobiaWithoutPanicHx" type="xs:integer" minOccurs="0"/>
-								<xs:element name="currentSocialPhobia" type="xs:integer" minOccurs="0"/>
-								<xs:element name="pastSocialPhobia" type="xs:integer" minOccurs="0"/>
-								<xs:element name="currentSpecificPhobia" type="xs:integer" minOccurs="0"/>
-								<xs:element name="pastSpecificPhobia" type="xs:integer" minOccurs="0"/>
-								<xs:element name="currentOCD" type="xs:integer" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>Obsessive-Compulsive Disorder</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="pastOCD" type="xs:integer" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>Obsessive-Compulsive Disorder</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="currentPTSD" type="xs:integer" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>Posttraumatic Stress Disorder</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="pastPTSD" type="xs:integer" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>Posttraumatic Stress Disorder</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="currentGeneralizedAnxietyDisorder" type="xs:integer" minOccurs="0"/>
-								<xs:element name="currentAnxietyDueToMedicalCondition" type="xs:integer" minOccurs="0"/>
-								<xs:element name="pastAnxietyDueToMedicalCondition" type="xs:integer" minOccurs="0"/>
-								<xs:element name="currentSubstanceInducedAnxietyDisorder" type="xs:integer" minOccurs="0"/>
-								<xs:element name="pastSubstanceInducedAnxietyDisorder" type="xs:integer" minOccurs="0"/>
-								<xs:element name="currentAnxietyDisorderNOS" type="xs:integer" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>not otherwise specified</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="pastAnxietyDisorderNOS" type="xs:integer" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>not otherwise specified</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="somatoformDisorders" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>current only</xs:documentation>
-						</xs:annotation>
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="somatizationDisorder" type="xs:integer" minOccurs="0"/>
-								<xs:element name="undifferentiatedSomatformDisorder" type="xs:integer" minOccurs="0"/>
-								<xs:element name="painDisorder" type="xs:integer" minOccurs="0"/>
-								<xs:element name="hypochondriasis" type="xs:integer" minOccurs="0"/>
-								<xs:element name="bodyDysmorphicDisorder" type="xs:integer" minOccurs="0"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="eatingDisorders" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="currentAnorexiaNervosa" type="xs:integer" minOccurs="0"/>
-								<xs:element name="pastAnorexiaNervosa" type="xs:integer" minOccurs="0"/>
-								<xs:element name="currentBulimiaNervosa" type="xs:integer" minOccurs="0"/>
-								<xs:element name="pastBulimiaNervosa" type="xs:integer" minOccurs="0"/>
-								<xs:element name="currentBingeEatingDisorder" type="xs:integer" minOccurs="0"/>
-								<xs:element name="pastBingeEatingDisorder" type="xs:integer" minOccurs="0"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="adjustmentDisorder" type="xs:integer" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>current only</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="optional" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="currentAcuteStressDisorder" type="xs:integer" minOccurs="0"/>
-								<xs:element name="pastAcuteStressDisorder" type="xs:integer" minOccurs="0"/>
-								<xs:element name="currentMinorDepressiveDisorder" type="xs:integer" minOccurs="0"/>
-								<xs:element name="pastMinorDepressiveDisorder" type="xs:integer" minOccurs="0"/>
-								<xs:element name="currentMixedAnxietyDepressiveDisorder" type="xs:integer" minOccurs="0"/>
-								<xs:element name="pastMixedAnxietyDepressiveDisorder" type="xs:integer" minOccurs="0"/>
-								<xs:element name="pastSympomaticDetails" type="xs:string" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>Symptomatic details of past major depressive/manic episodes</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-</xs:schema>
diff --git a/src/main/webapp/schemas/assessments/display/xnat_a_scidResearchData_display.xml b/src/main/webapp/schemas/assessments/display/xnat_a_scidResearchData_display.xml
deleted file mode 100644
index 64da91d6..00000000
--- a/src/main/webapp/schemas/assessments/display/xnat_a_scidResearchData_display.xml
+++ /dev/null
@@ -1,1223 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat_a:scidResearchData" full-description="SCID" brief-description="SCID">
-	<Arc name="PARTICIPANT_EXPERIMENT">
-		<CommonField id="PART_ID" local-field="SUBJECT_ID"/>
-		<CommonField id="DATE" local-field="DATE"/>
-		<CommonField id="EXPT_ID" local-field="EXPT_ID"/>
-	</Arc>
-	<DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData.subject_ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
-				<InsertValue id="Field1" field="SUBJECT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData.ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat_a:scidResearchData','xnat_a:scidResearchData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="RPT" header="ID" visible="true" image="true">
-		<Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat_a:scidResearchData','xnat_a:scidResearchData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="DATE" header="Date" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData.date"/>
-	</DisplayField>
-	<DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
-	<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData.date"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
-	<DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
-	<Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
-	</DisplayField>
-	<DisplayField header="Projects" id="PROJECTS" data-type="string">
-		<DisplayFieldElement name="Field1" viewName="XNAT_A_SCIDRESEARCHDATA_PROJECTS" viewColumn="PROJECTS"/>
-	</DisplayField>
-	<DisplayField header="Label" id="LABEL" data-type="string">
-	<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData.ID"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat_a:scidResearchData.label"/>
-	<Content type="sql">COALESCE(@Field2, @Field1)</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat_a:scidResearchData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat_a:scidResearchData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat_a:scidResearchData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat_a:scidResearchData/search_field/xnat_a:scidResearchData.ID">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat_a:scidResearchData','xnat_a:scidResearchData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="TITLE" value="Inserted: @Field1 (@Field2)">
-				<InsertValue id="Field1" field="INSERT_DATE"/>
-				<InsertValue id="Field2" field="INSERT_USER"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData.project"/>
-	</DisplayField>
-	<DisplayField id="XNAT_A_SCIDRESEARCHDATA_PROJECT_IDENTIFIER" header="XNAT_A_SCIDRESEARCHDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">xnat_a_scidresearchdata_project_id</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat_a:scidResearchData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat_a:scidResearchData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat_a:scidResearchData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat_a:scidResearchData/search_field/xnat_a:scidResearchData.ID/project/@Field2">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-				<InsertValue id="Field2" field="@WHERE"/>
-			</Property>
-		</HTML-Link>
-		<SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_a_scidresearchdata_project_id,sharing_share_xnat_experimentda_id FROM (	SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE'	UNION 	SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat_a:scidResearchData.ID" queryField="sharing_share_xnat_experimentda_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayField id="XNAT_A_SCIDRESEARCHDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">field</Content>
-		<SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat_a:scidResearchData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat_a:scidResearchData.ID" queryField="expt_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayField id="ADMINISTRATOR" header="administrator" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/administrator"/>
-	</DisplayField>
-	<DisplayField id="MOODEPISODES_CURRENTMAJORDEPRESSIVEEPISODE" header="currentMajorDepressiveEpisode" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/moodEpisodes/currentMajorDepressiveEpisode"/>
-	</DisplayField>
-	<DisplayField id="MOODEPISODES_PASTMAJORDEPRESSIVEEPISODE" header="pastMajorDepressiveEpisode" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/moodEpisodes/pastMajorDepressiveEpisode"/>
-	</DisplayField>
-	<DisplayField id="MOODEPISODES_CURRENTMANICEPISODE" header="currentManicEpisode" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/moodEpisodes/currentManicEpisode"/>
-	</DisplayField>
-	<DisplayField id="MOODEPISODES_PASTMANICEPISODE" header="pastManicEpisode" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/moodEpisodes/pastManicEpisode"/>
-	</DisplayField>
-	<DisplayField id="MOODEPISODES_CURRENTHYPOMANICEPISODE" header="currentHypomanicEpisode" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/moodEpisodes/currentHypomanicEpisode"/>
-	</DisplayField>
-	<DisplayField id="MOODEPISODES_PASTHYPOMANICEPISODE" header="pastHypomanicEpisode" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/moodEpisodes/pastHypomanicEpisode"/>
-	</DisplayField>
-	<DisplayField id="MOODEPISODES_CURRENTDYSTHMICEPISODE" header="currentDysthmicEpisode" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/moodEpisodes/currentDysthmicEpisode"/>
-	</DisplayField>
-	<DisplayField id="MOODEPISODES_CURRENTMOODDISORDERDUETOMEDICALCONDITION" header="currentMoodDisorderDueToMedicalCondition" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/moodEpisodes/currentMoodDisorderDueToMedicalCondition"/>
-	</DisplayField>
-	<DisplayField id="MOODEPISODES_PASTMOODDISORDERDUETOMEDICALCONDITION" header="pastMoodDisorderDueToMedicalCondition" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/moodEpisodes/pastMoodDisorderDueToMedicalCondition"/>
-	</DisplayField>
-	<DisplayField id="MOODEPISODES_CURRENTSUBSTANCEINDUCEDMOODDISORDER" header="currentSubstanceInducedMoodDisorder" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/moodEpisodes/currentSubstanceInducedMoodDisorder"/>
-	</DisplayField>
-	<DisplayField id="MOODEPISODES_PASTSUBSTANCEINDUCEDMOODDISORDER" header="pastSubstanceInducedMoodDisorder" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/moodEpisodes/pastSubstanceInducedMoodDisorder"/>
-	</DisplayField>
-	<DisplayField id="PSYCHOTICSYMPTOMS_CURRENTDELUSIONS" header="currentDelusions" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticSymptoms/currentDelusions"/>
-	</DisplayField>
-	<DisplayField id="PSYCHOTICSYMPTOMS_PASTDELUSIONS" header="pastDelusions" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticSymptoms/pastDelusions"/>
-	</DisplayField>
-	<DisplayField id="PSYCHOTICSYMPTOMS_CURRENTHALLUCINATIONS" header="currentHallucinations" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticSymptoms/currentHallucinations"/>
-	</DisplayField>
-	<DisplayField id="PSYCHOTICSYMPTOMS_PASTHALLUCINATIONS" header="pastHallucinations" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticSymptoms/pastHallucinations"/>
-	</DisplayField>
-	<DisplayField id="PSYCHOTICSYMPTOMS_CURRENTDISORGANIZEDSPEECHBEHAVIOR" header="currentDisorganizedSpeechBehavior" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticSymptoms/currentDisorganizedSpeechBehavior"/>
-	</DisplayField>
-	<DisplayField id="PSYCHOTICSYMPTOMS_PASTDISORGANIZEDSPEECHBEHAVIOR" header="pastDisorganizedSpeechBehavior" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticSymptoms/pastDisorganizedSpeechBehavior"/>
-	</DisplayField>
-	<DisplayField id="PSYCHOTICSYMPTOMS_CURRENTCATATONICBEHAVIOR" header="currentCatatonicBehavior" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticSymptoms/currentCatatonicBehavior"/>
-	</DisplayField>
-	<DisplayField id="PSYCHOTICSYMPTOMS_PASTCATATONICBEHAVIOR" header="pastCatatonicBehavior" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticSymptoms/pastCatatonicBehavior"/>
-	</DisplayField>
-	<DisplayField id="PSYCHOTICSYMPTOMS_CURRENTNEGATIVESYMPTOMS" header="currentNegativeSymptoms" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticSymptoms/currentNegativeSymptoms"/>
-	</DisplayField>
-	<DisplayField id="PSYCHOTICSYMPTOMS_PASTNEGATIVESYMPTOMS" header="pastNegativeSymptoms" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticSymptoms/pastNegativeSymptoms"/>
-	</DisplayField>
-	<DisplayField id="PSYCHOTICDISORDERS_CURRENTSCHIZOPHRENIA" header="currentSchizophrenia" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticDisorders/currentSchizophrenia"/>
-	</DisplayField>
-	<DisplayField id="PSYCHOTICDISORDERS_PASTSCHIZOPHRENIA" header="pastSchizophrenia" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticDisorders/pastSchizophrenia"/>
-	</DisplayField>
-	<DisplayField id="PSYCHOTICDISORDERS_CURRENTPARANOIDTYPE" header="currentParanoidType" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticDisorders/currentParanoidType"/>
-	</DisplayField>
-	<DisplayField id="PSYCHOTICDISORDERS_PASTPARANOIDTYPE" header="pastParanoidType" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticDisorders/pastParanoidType"/>
-	</DisplayField>
-	<DisplayField id="PSYCHOTICDISORDERS_CURRENTCATATONICTYPE" header="currentCatatonicType" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticDisorders/currentCatatonicType"/>
-	</DisplayField>
-	<DisplayField id="PSYCHOTICDISORDERS_PASTCATATONICTYPE" header="pastCatatonicType" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticDisorders/pastCatatonicType"/>
-	</DisplayField>
-	<DisplayField id="PSYCHOTICDISORDERS_CURRENTDISORGANIZEDTYPE" header="currentDisorganizedType" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticDisorders/currentDisorganizedType"/>
-	</DisplayField>
-	<DisplayField id="PSYCHOTICDISORDERS_PASTDISORGANIZEDTYPE" header="pastDisorganizedType" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticDisorders/pastDisorganizedType"/>
-	</DisplayField>
-	<DisplayField id="PSYCHOTICDISORDERS_CURRENTUNDIFFERENTIATEDTYPE" header="currentUndifferentiatedType" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticDisorders/currentUndifferentiatedType"/>
-	</DisplayField>
-	<DisplayField id="PSYCHOTICDISORDERS_PASTUNDIFFERENTIATEDTYPE" header="pastUndifferentiatedType" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticDisorders/pastUndifferentiatedType"/>
-	</DisplayField>
-	<DisplayField id="PSYCHOTICDISORDERS_CURRENTRESIDUALTYPE" header="currentResidualType" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticDisorders/currentResidualType"/>
-	</DisplayField>
-	<DisplayField id="PSYCHOTICDISORDERS_PASTRESIDUALTYPE" header="pastResidualType" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticDisorders/pastResidualType"/>
-	</DisplayField>
-	<DisplayField id="PSYCHOTICDISORDERS_CURRENTSCHIZOPHRENIFORMDISORDER" header="currentSchizophreniformDisorder" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticDisorders/currentSchizophreniformDisorder"/>
-	</DisplayField>
-	<DisplayField id="PSYCHOTICDISORDERS_PASTSCHIZOPHRENIFORMDISORDER" header="pastSchizophreniformDisorder" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticDisorders/pastSchizophreniformDisorder"/>
-	</DisplayField>
-	<DisplayField id="PSYCHOTICDISORDERS_CURRENTSCHIZOAFFECTIVEDISORDER" header="currentSchizoaffectiveDisorder" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticDisorders/currentSchizoaffectiveDisorder"/>
-	</DisplayField>
-	<DisplayField id="PSYCHOTICDISORDERS_PASTSCHIZOAFFECTIVEDISORDER" header="pastSchizoaffectiveDisorder" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticDisorders/pastSchizoaffectiveDisorder"/>
-	</DisplayField>
-	<DisplayField id="PSYCHOTICDISORDERS_CURRENTDELUSIONALDISORDER" header="currentDelusionalDisorder" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticDisorders/currentDelusionalDisorder"/>
-	</DisplayField>
-	<DisplayField id="PSYCHOTICDISORDERS_PASTDELUSIONALDISORDER" header="pastDelusionalDisorder" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticDisorders/pastDelusionalDisorder"/>
-	</DisplayField>
-	<DisplayField id="PSYCHOTICDISORDERS_CURRENTBRIEFPSYCHOTICDISORDER" header="currentBriefPsychoticDisorder" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticDisorders/currentBriefPsychoticDisorder"/>
-	</DisplayField>
-	<DisplayField id="PSYCHOTICDISORDERS_PASTBRIEFPSYCHOTICDISORDER" header="pastBriefPsychoticDisorder" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticDisorders/pastBriefPsychoticDisorder"/>
-	</DisplayField>
-	<DisplayField id="PSYCHOTICDISORDERS_CURRENTPSYCHOTICDISORDERDUETOMEDICALCONDITIO" header="currentPsychoticDisorderDueToMedicalCondition" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticDisorders/currentPsychoticDisorderDueToMedicalCondition"/>
-	</DisplayField>
-	<DisplayField id="PSYCHOTICDISORDERS_PASTPSYCHOTICDISORDERDUETOMEDICALCONDITION" header="pastPsychoticDisorderDueToMedicalCondition" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticDisorders/pastPsychoticDisorderDueToMedicalCondition"/>
-	</DisplayField>
-	<DisplayField id="PSYCHOTICDISORDERS_CURRENTSUBSTANCEINDUCEDPSYCHOTICDISORDER" header="currentSubstanceInducedPsychoticDisorder" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticDisorders/currentSubstanceInducedPsychoticDisorder"/>
-	</DisplayField>
-	<DisplayField id="PSYCHOTICDISORDERS_PASTSUBSTANCEINDUCEDPSYCHOTICDISORDER" header="pastSubstanceInducedPsychoticDisorder" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticDisorders/pastSubstanceInducedPsychoticDisorder"/>
-	</DisplayField>
-	<DisplayField id="PSYCHOTICDISORDERS_CURRENTPSYCHOTICDISORDERNOS" header="currentPsychoticDisorderNOS" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticDisorders/currentPsychoticDisorderNOS"/>
-	</DisplayField>
-	<DisplayField id="PSYCHOTICDISORDERS_PASTPSYCHOTICDISORDERNOS" header="pastPsychoticDisorderNOS" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticDisorders/pastPsychoticDisorderNOS"/>
-	</DisplayField>
-	<DisplayField id="MOODDISORDERS_CURRENTBIPOLAR1DISORDER" header="currentBipolar1Disorder" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/moodDisorders/currentBipolar1Disorder"/>
-	</DisplayField>
-	<DisplayField id="MOODDISORDERS_PASTBIPOLAR1DISORDER" header="pastBipolar1Disorder" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/moodDisorders/pastBipolar1Disorder"/>
-	</DisplayField>
-	<DisplayField id="MOODDISORDERS_CURRENTBIPOLAR2DISORDER" header="currentBipolar2Disorder" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/moodDisorders/currentBipolar2Disorder"/>
-	</DisplayField>
-	<DisplayField id="MOODDISORDERS_PASTBIPOLAR2DISORDER" header="pastBipolar2Disorder" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/moodDisorders/pastBipolar2Disorder"/>
-	</DisplayField>
-	<DisplayField id="MOODDISORDERS_CURRENTOTHERBIPOLARDISORDER" header="currentOtherBipolarDisorder" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/moodDisorders/currentOtherBipolarDisorder"/>
-	</DisplayField>
-	<DisplayField id="MOODDISORDERS_PASTOTHERBIPOLARDISORDER" header="pastOtherBipolarDisorder" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/moodDisorders/pastOtherBipolarDisorder"/>
-	</DisplayField>
-	<DisplayField id="MOODDISORDERS_CURRENTMAJORDEPRESSIVEDISORDER" header="currentMajorDepressiveDisorder" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/moodDisorders/currentMajorDepressiveDisorder"/>
-	</DisplayField>
-	<DisplayField id="MOODDISORDERS_PASTMAJORDEPRESSIVEDISORDER" header="pastMajorDepressiveDisorder" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/moodDisorders/pastMajorDepressiveDisorder"/>
-	</DisplayField>
-	<DisplayField id="MOODDISORDERS_CURRENTDEPRESSIVEDISORDERNOS" header="currentDepressiveDisorderNOS" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/moodDisorders/currentDepressiveDisorderNOS"/>
-	</DisplayField>
-	<DisplayField id="MOODDISORDERS_PASTDEPRESSIVEDISORDERNOS" header="pastDepressiveDisorderNOS" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/moodDisorders/pastDepressiveDisorderNOS"/>
-	</DisplayField>
-	<DisplayField id="SUBSTANCEUSEDISORDERS_CURRENTALCOHOLDEPENDENCE" header="currentAlcoholDependence" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/currentAlcoholDependence"/>
-	</DisplayField>
-	<DisplayField id="SUBSTANCEUSEDISORDERS_PASTALCOHOLDEPENDENCE" header="pastAlcoholDependence" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/pastAlcoholDependence"/>
-	</DisplayField>
-	<DisplayField id="SUBSTANCEUSEDISORDERS_CURRENTALCOHOLABUSE" header="currentAlcoholAbuse" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/currentAlcoholAbuse"/>
-	</DisplayField>
-	<DisplayField id="SUBSTANCEUSEDISORDERS_PASTALCOHOLABUSE" header="pastAlcoholAbuse" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/pastAlcoholAbuse"/>
-	</DisplayField>
-	<DisplayField id="SUBSTANCEUSEDISORDERS_CURRENTAMPHETAMINEDEPENDENCE" header="currentAmphetamineDependence" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/currentAmphetamineDependence"/>
-	</DisplayField>
-	<DisplayField id="SUBSTANCEUSEDISORDERS_PASTAMPHETAMINEDEPENDENCE" header="pastAmphetamineDependence" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/pastAmphetamineDependence"/>
-	</DisplayField>
-	<DisplayField id="SUBSTANCEUSEDISORDERS_CURRENTAMPHETAMINEABUSE" header="currentAmphetamineAbuse" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/currentAmphetamineAbuse"/>
-	</DisplayField>
-	<DisplayField id="SUBSTANCEUSEDISORDERS_PASTAMPHETAMINEABUSE" header="pastAmphetamineAbuse" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/pastAmphetamineAbuse"/>
-	</DisplayField>
-	<DisplayField id="SUBSTANCEUSEDISORDERS_CURRENTCANNABISDEPENDENCE" header="currentCannabisDependence" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/currentCannabisDependence"/>
-	</DisplayField>
-	<DisplayField id="SUBSTANCEUSEDISORDERS_PASTCANNABISDEPENDENCE" header="pastCannabisDependence" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/pastCannabisDependence"/>
-	</DisplayField>
-	<DisplayField id="SUBSTANCEUSEDISORDERS_CURRENTCANNABISABUSE" header="currentCannabisAbuse" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/currentCannabisAbuse"/>
-	</DisplayField>
-	<DisplayField id="SUBSTANCEUSEDISORDERS_PASTCANNABISABUSE" header="pastCannabisAbuse" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/pastCannabisAbuse"/>
-	</DisplayField>
-	<DisplayField id="SUBSTANCEUSEDISORDERS_CURRENTCOCAINEDEPENDENCE" header="currentCocaineDependence" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/currentCocaineDependence"/>
-	</DisplayField>
-	<DisplayField id="SUBSTANCEUSEDISORDERS_PASTCOCAINEDEPENDENCE" header="pastCocaineDependence" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/pastCocaineDependence"/>
-	</DisplayField>
-	<DisplayField id="SUBSTANCEUSEDISORDERS_CURRENTCOCAINEABUSE" header="currentCocaineAbuse" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/currentCocaineAbuse"/>
-	</DisplayField>
-	<DisplayField id="SUBSTANCEUSEDISORDERS_PASTCOCAINEABUSE" header="pastCocaineAbuse" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/pastCocaineAbuse"/>
-	</DisplayField>
-	<DisplayField id="SUBSTANCEUSEDISORDERS_CURRENTHALLUCINOGENDEPENDENCE" header="currentHallucinogenDependence" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/currentHallucinogenDependence"/>
-	</DisplayField>
-	<DisplayField id="SUBSTANCEUSEDISORDERS_PASTHALLUCINOGENDEPENDENCE" header="pastHallucinogenDependence" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/pastHallucinogenDependence"/>
-	</DisplayField>
-	<DisplayField id="SUBSTANCEUSEDISORDERS_CURRENTHALLUCINOGENABUSE" header="currentHallucinogenAbuse" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/currentHallucinogenAbuse"/>
-	</DisplayField>
-	<DisplayField id="SUBSTANCEUSEDISORDERS_PASTHALLUCINOGENABUSE" header="pastHallucinogenAbuse" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/pastHallucinogenAbuse"/>
-	</DisplayField>
-	<DisplayField id="SUBSTANCEUSEDISORDERS_CURRENTOPIOIDDEPENDENCE" header="currentOpioidDependence" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/currentOpioidDependence"/>
-	</DisplayField>
-	<DisplayField id="SUBSTANCEUSEDISORDERS_PASTOPIOIDDEPENDENCE" header="pastOpioidDependence" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/pastOpioidDependence"/>
-	</DisplayField>
-	<DisplayField id="SUBSTANCEUSEDISORDERS_CURRENTOPIOIDABUSE" header="currentOpioidAbuse" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/currentOpioidAbuse"/>
-	</DisplayField>
-	<DisplayField id="SUBSTANCEUSEDISORDERS_PASTOPIOIDABUSE" header="pastOpioidAbuse" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/pastOpioidAbuse"/>
-	</DisplayField>
-	<DisplayField id="SUBSTANCEUSEDISORDERS_CURRENTPHENCYCLIDINEDEPENDENCE" header="currentPhencyclidineDependence" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/currentPhencyclidineDependence"/>
-	</DisplayField>
-	<DisplayField id="SUBSTANCEUSEDISORDERS_PASTPHENCYCLIDINEDEPENDENCE" header="pastPhencyclidineDependence" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/pastPhencyclidineDependence"/>
-	</DisplayField>
-	<DisplayField id="SUBSTANCEUSEDISORDERS_CURRENTPHENCYCLIDINEABUSE" header="currentPhencyclidineAbuse" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/currentPhencyclidineAbuse"/>
-	</DisplayField>
-	<DisplayField id="SUBSTANCEUSEDISORDERS_PASTPHENCYCLIDINEABUSE" header="pastPhencyclidineAbuse" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/pastPhencyclidineAbuse"/>
-	</DisplayField>
-	<DisplayField id="SUBSTANCEUSEDISORDERS_CURRENTSEDATIVEHYPNOTICANXIOLYTICDEPENDEN" header="currentSedativeHypnoticAnxiolyticDependence" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/currentSedativeHypnoticAnxiolyticDependence"/>
-	</DisplayField>
-	<DisplayField id="SUBSTANCEUSEDISORDERS_PASTSEDATIVEHYPNOTICANXIOLYTICDEPENDENCE" header="pastSedativeHypnoticAnxiolyticDependence" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/pastSedativeHypnoticAnxiolyticDependence"/>
-	</DisplayField>
-	<DisplayField id="SUBSTANCEUSEDISORDERS_CURRENTSEDATIVEHYPNOTICANXIOLYTICABUSE" header="currentSedativeHypnoticAnxiolyticAbuse" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/currentSedativeHypnoticAnxiolyticAbuse"/>
-	</DisplayField>
-	<DisplayField id="SUBSTANCEUSEDISORDERS_PASTSEDATIVEHYPNOTICANXIOLYTICABUSE" header="pastSedativeHypnoticAnxiolyticAbuse" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/pastSedativeHypnoticAnxiolyticAbuse"/>
-	</DisplayField>
-	<DisplayField id="SUBSTANCEUSEDISORDERS_CURRENTPOLYSUBSTANCEDEPENDENCE" header="currentPolysubstanceDependence" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/currentPolysubstanceDependence"/>
-	</DisplayField>
-	<DisplayField id="SUBSTANCEUSEDISORDERS_PASTPOLYSUBSTANCEDEPENDENCE" header="pastPolysubstanceDependence" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/pastPolysubstanceDependence"/>
-	</DisplayField>
-	<DisplayField id="SUBSTANCEUSEDISORDERS_CURRENTOTHERORUNKNOWNDEPENDENCE" header="currentOtherOrUnknownDependence" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/currentOtherOrUnknownDependence"/>
-	</DisplayField>
-	<DisplayField id="SUBSTANCEUSEDISORDERS_PASTOTHERORUNKNOWNDEPENDENCE" header="pastOtherOrUnknownDependence" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/pastOtherOrUnknownDependence"/>
-	</DisplayField>
-	<DisplayField id="SUBSTANCEUSEDISORDERS_CURRENTOTHERORUNKNOWNABUSE" header="currentOtherOrUnknownAbuse" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/currentOtherOrUnknownAbuse"/>
-	</DisplayField>
-	<DisplayField id="SUBSTANCEUSEDISORDERS_PASTOTHERORUNKNOWNABUSE" header="pastOtherOrUnknownAbuse" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/pastOtherOrUnknownAbuse"/>
-	</DisplayField>
-	<DisplayField id="ANXIETYDISORDERS_CURRENTPANICWITHAGORAPHOBIA" header="currentPanicWithAgoraphobia" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/anxietyDisorders/currentPanicWithAgoraphobia"/>
-	</DisplayField>
-	<DisplayField id="ANXIETYDISORDERS_PASTPANICWITHAGORAPHOBIA" header="pastPanicWithAgoraphobia" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/anxietyDisorders/pastPanicWithAgoraphobia"/>
-	</DisplayField>
-	<DisplayField id="ANXIETYDISORDERS_CURRENTPANICWITHOUTAGORAPHOBIA" header="currentPanicWithoutAgoraphobia" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/anxietyDisorders/currentPanicWithoutAgoraphobia"/>
-	</DisplayField>
-	<DisplayField id="ANXIETYDISORDERS_PASTPANICWITHOUTAGORAPHOBIA" header="pastPanicWithoutAgoraphobia" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/anxietyDisorders/pastPanicWithoutAgoraphobia"/>
-	</DisplayField>
-	<DisplayField id="ANXIETYDISORDERS_CURRENTAGORAPHOBIAWITHOUTPANICHX" header="currentAgoraphobiaWithoutPanicHx" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/anxietyDisorders/currentAgoraphobiaWithoutPanicHx"/>
-	</DisplayField>
-	<DisplayField id="ANXIETYDISORDERS_PASTAGORAPHOBIAWITHOUTPANICHX" header="pastAgoraphobiaWithoutPanicHx" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/anxietyDisorders/pastAgoraphobiaWithoutPanicHx"/>
-	</DisplayField>
-	<DisplayField id="ANXIETYDISORDERS_CURRENTSOCIALPHOBIA" header="currentSocialPhobia" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/anxietyDisorders/currentSocialPhobia"/>
-	</DisplayField>
-	<DisplayField id="ANXIETYDISORDERS_PASTSOCIALPHOBIA" header="pastSocialPhobia" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/anxietyDisorders/pastSocialPhobia"/>
-	</DisplayField>
-	<DisplayField id="ANXIETYDISORDERS_CURRENTSPECIFICPHOBIA" header="currentSpecificPhobia" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/anxietyDisorders/currentSpecificPhobia"/>
-	</DisplayField>
-	<DisplayField id="ANXIETYDISORDERS_PASTSPECIFICPHOBIA" header="pastSpecificPhobia" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/anxietyDisorders/pastSpecificPhobia"/>
-	</DisplayField>
-	<DisplayField id="ANXIETYDISORDERS_CURRENTOCD" header="currentOCD" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/anxietyDisorders/currentOCD"/>
-	</DisplayField>
-	<DisplayField id="ANXIETYDISORDERS_PASTOCD" header="pastOCD" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/anxietyDisorders/pastOCD"/>
-	</DisplayField>
-	<DisplayField id="ANXIETYDISORDERS_CURRENTPTSD" header="currentPTSD" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/anxietyDisorders/currentPTSD"/>
-	</DisplayField>
-	<DisplayField id="ANXIETYDISORDERS_PASTPTSD" header="pastPTSD" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/anxietyDisorders/pastPTSD"/>
-	</DisplayField>
-	<DisplayField id="ANXIETYDISORDERS_CURRENTGENERALIZEDANXIETYDISORDER" header="currentGeneralizedAnxietyDisorder" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/anxietyDisorders/currentGeneralizedAnxietyDisorder"/>
-	</DisplayField>
-	<DisplayField id="ANXIETYDISORDERS_CURRENTANXIETYDUETOMEDICALCONDITION" header="currentAnxietyDueToMedicalCondition" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/anxietyDisorders/currentAnxietyDueToMedicalCondition"/>
-	</DisplayField>
-	<DisplayField id="ANXIETYDISORDERS_PASTANXIETYDUETOMEDICALCONDITION" header="pastAnxietyDueToMedicalCondition" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/anxietyDisorders/pastAnxietyDueToMedicalCondition"/>
-	</DisplayField>
-	<DisplayField id="ANXIETYDISORDERS_CURRENTSUBSTANCEINDUCEDANXIETYDISORDER" header="currentSubstanceInducedAnxietyDisorder" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/anxietyDisorders/currentSubstanceInducedAnxietyDisorder"/>
-	</DisplayField>
-	<DisplayField id="ANXIETYDISORDERS_PASTSUBSTANCEINDUCEDANXIETYDISORDER" header="pastSubstanceInducedAnxietyDisorder" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/anxietyDisorders/pastSubstanceInducedAnxietyDisorder"/>
-	</DisplayField>
-	<DisplayField id="ANXIETYDISORDERS_CURRENTANXIETYDISORDERNOS" header="currentAnxietyDisorderNOS" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/anxietyDisorders/currentAnxietyDisorderNOS"/>
-	</DisplayField>
-	<DisplayField id="ANXIETYDISORDERS_PASTANXIETYDISORDERNOS" header="pastAnxietyDisorderNOS" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/anxietyDisorders/pastAnxietyDisorderNOS"/>
-	</DisplayField>
-	<DisplayField id="SOMATOFORMDISORDERS_SOMATIZATIONDISORDER" header="somatizationDisorder" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/somatoformDisorders/somatizationDisorder"/>
-	</DisplayField>
-	<DisplayField id="SOMATOFORMDISORDERS_UNDIFFERENTIATEDSOMATFORMDISORDER" header="undifferentiatedSomatformDisorder" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/somatoformDisorders/undifferentiatedSomatformDisorder"/>
-	</DisplayField>
-	<DisplayField id="SOMATOFORMDISORDERS_PAINDISORDER" header="painDisorder" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/somatoformDisorders/painDisorder"/>
-	</DisplayField>
-	<DisplayField id="SOMATOFORMDISORDERS_HYPOCHONDRIASIS" header="hypochondriasis" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/somatoformDisorders/hypochondriasis"/>
-	</DisplayField>
-	<DisplayField id="SOMATOFORMDISORDERS_BODYDYSMORPHICDISORDER" header="bodyDysmorphicDisorder" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/somatoformDisorders/bodyDysmorphicDisorder"/>
-	</DisplayField>
-	<DisplayField id="EATINGDISORDERS_CURRENTANOREXIANERVOSA" header="currentAnorexiaNervosa" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/eatingDisorders/currentAnorexiaNervosa"/>
-	</DisplayField>
-	<DisplayField id="EATINGDISORDERS_PASTANOREXIANERVOSA" header="pastAnorexiaNervosa" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/eatingDisorders/pastAnorexiaNervosa"/>
-	</DisplayField>
-	<DisplayField id="EATINGDISORDERS_CURRENTBULIMIANERVOSA" header="currentBulimiaNervosa" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/eatingDisorders/currentBulimiaNervosa"/>
-	</DisplayField>
-	<DisplayField id="EATINGDISORDERS_PASTBULIMIANERVOSA" header="pastBulimiaNervosa" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/eatingDisorders/pastBulimiaNervosa"/>
-	</DisplayField>
-	<DisplayField id="EATINGDISORDERS_CURRENTBINGEEATINGDISORDER" header="currentBingeEatingDisorder" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/eatingDisorders/currentBingeEatingDisorder"/>
-	</DisplayField>
-	<DisplayField id="EATINGDISORDERS_PASTBINGEEATINGDISORDER" header="pastBingeEatingDisorder" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/eatingDisorders/pastBingeEatingDisorder"/>
-	</DisplayField>
-	<DisplayField id="ADJUSTMENTDISORDER" header="adjustmentDisorder" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/adjustmentDisorder"/>
-	</DisplayField>
-	<DisplayField id="OPTIONAL_CURRENTACUTESTRESSDISORDER" header="currentAcuteStressDisorder" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/optional/currentAcuteStressDisorder"/>
-	</DisplayField>
-	<DisplayField id="OPTIONAL_PASTACUTESTRESSDISORDER" header="pastAcuteStressDisorder" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/optional/pastAcuteStressDisorder"/>
-	</DisplayField>
-	<DisplayField id="OPTIONAL_CURRENTMINORDEPRESSIVEDISORDER" header="currentMinorDepressiveDisorder" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/optional/currentMinorDepressiveDisorder"/>
-	</DisplayField>
-	<DisplayField id="OPTIONAL_PASTMINORDEPRESSIVEDISORDER" header="pastMinorDepressiveDisorder" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/optional/pastMinorDepressiveDisorder"/>
-	</DisplayField>
-	<DisplayField id="OPTIONAL_CURRENTMIXEDANXIETYDEPRESSIVEDISORDER" header="currentMixedAnxietyDepressiveDisorder" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/optional/currentMixedAnxietyDepressiveDisorder"/>
-	</DisplayField>
-	<DisplayField id="OPTIONAL_PASTMIXEDANXIETYDEPRESSIVEDISORDER" header="pastMixedAnxietyDepressiveDisorder" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/optional/pastMixedAnxietyDepressiveDisorder"/>
-	</DisplayField>
-	<DisplayField id="OPTIONAL_PASTSYMPOMATICDETAILS" header="pastSympomaticDetails" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/optional/pastSympomaticDetails"/>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="SCID" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="RPT"/>
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="AGE"/>
-		<DisplayFieldRef id="ADMINISTRATOR"/>
-		<DisplayFieldRef id="MOODEPISODES_CURRENTMAJORDEPRESSIVEEPISODE"/>
-		<DisplayFieldRef id="MOODEPISODES_PASTMAJORDEPRESSIVEEPISODE"/>
-		<DisplayFieldRef id="MOODEPISODES_CURRENTMANICEPISODE"/>
-		<DisplayFieldRef id="MOODEPISODES_PASTMANICEPISODE"/>
-		<DisplayFieldRef id="MOODEPISODES_CURRENTHYPOMANICEPISODE"/>
-		<DisplayFieldRef id="MOODEPISODES_PASTHYPOMANICEPISODE"/>
-		<DisplayFieldRef id="MOODEPISODES_CURRENTDYSTHMICEPISODE"/>
-		<DisplayFieldRef id="MOODEPISODES_CURRENTMOODDISORDERDUETOMEDICALCONDITION"/>
-		<DisplayFieldRef id="MOODEPISODES_PASTMOODDISORDERDUETOMEDICALCONDITION"/>
-		<DisplayFieldRef id="MOODEPISODES_CURRENTSUBSTANCEINDUCEDMOODDISORDER"/>
-		<DisplayFieldRef id="MOODEPISODES_PASTSUBSTANCEINDUCEDMOODDISORDER"/>
-		<DisplayFieldRef id="PSYCHOTICSYMPTOMS_CURRENTDELUSIONS"/>
-		<DisplayFieldRef id="PSYCHOTICSYMPTOMS_PASTDELUSIONS"/>
-		<DisplayFieldRef id="PSYCHOTICSYMPTOMS_CURRENTHALLUCINATIONS"/>
-		<DisplayFieldRef id="PSYCHOTICSYMPTOMS_PASTHALLUCINATIONS"/>
-		<DisplayFieldRef id="PSYCHOTICSYMPTOMS_CURRENTDISORGANIZEDSPEECHBEHAVIOR"/>
-		<DisplayFieldRef id="PSYCHOTICSYMPTOMS_PASTDISORGANIZEDSPEECHBEHAVIOR"/>
-		<DisplayFieldRef id="PSYCHOTICSYMPTOMS_CURRENTCATATONICBEHAVIOR"/>
-		<DisplayFieldRef id="PSYCHOTICSYMPTOMS_PASTCATATONICBEHAVIOR"/>
-		<DisplayFieldRef id="PSYCHOTICSYMPTOMS_CURRENTNEGATIVESYMPTOMS"/>
-		<DisplayFieldRef id="PSYCHOTICSYMPTOMS_PASTNEGATIVESYMPTOMS"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTSCHIZOPHRENIA"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_PASTSCHIZOPHRENIA"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTPARANOIDTYPE"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_PASTPARANOIDTYPE"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTCATATONICTYPE"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_PASTCATATONICTYPE"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTDISORGANIZEDTYPE"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_PASTDISORGANIZEDTYPE"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTUNDIFFERENTIATEDTYPE"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_PASTUNDIFFERENTIATEDTYPE"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTRESIDUALTYPE"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_PASTRESIDUALTYPE"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTSCHIZOPHRENIFORMDISORDER"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_PASTSCHIZOPHRENIFORMDISORDER"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTSCHIZOAFFECTIVEDISORDER"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_PASTSCHIZOAFFECTIVEDISORDER"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTDELUSIONALDISORDER"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_PASTDELUSIONALDISORDER"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTBRIEFPSYCHOTICDISORDER"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_PASTBRIEFPSYCHOTICDISORDER"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTPSYCHOTICDISORDERDUETOMEDICALCONDITIO"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_PASTPSYCHOTICDISORDERDUETOMEDICALCONDITION"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTSUBSTANCEINDUCEDPSYCHOTICDISORDER"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_PASTSUBSTANCEINDUCEDPSYCHOTICDISORDER"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTPSYCHOTICDISORDERNOS"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_PASTPSYCHOTICDISORDERNOS"/>
-		<DisplayFieldRef id="MOODDISORDERS_CURRENTBIPOLAR1DISORDER"/>
-		<DisplayFieldRef id="MOODDISORDERS_PASTBIPOLAR1DISORDER"/>
-		<DisplayFieldRef id="MOODDISORDERS_CURRENTBIPOLAR2DISORDER"/>
-		<DisplayFieldRef id="MOODDISORDERS_PASTBIPOLAR2DISORDER"/>
-		<DisplayFieldRef id="MOODDISORDERS_CURRENTOTHERBIPOLARDISORDER"/>
-		<DisplayFieldRef id="MOODDISORDERS_PASTOTHERBIPOLARDISORDER"/>
-		<DisplayFieldRef id="MOODDISORDERS_CURRENTMAJORDEPRESSIVEDISORDER"/>
-		<DisplayFieldRef id="MOODDISORDERS_PASTMAJORDEPRESSIVEDISORDER"/>
-		<DisplayFieldRef id="MOODDISORDERS_CURRENTDEPRESSIVEDISORDERNOS"/>
-		<DisplayFieldRef id="MOODDISORDERS_PASTDEPRESSIVEDISORDERNOS"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTALCOHOLDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTALCOHOLDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTALCOHOLABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTALCOHOLABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTAMPHETAMINEDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTAMPHETAMINEDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTAMPHETAMINEABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTAMPHETAMINEABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTCANNABISDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTCANNABISDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTCANNABISABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTCANNABISABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTCOCAINEDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTCOCAINEDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTCOCAINEABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTCOCAINEABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTHALLUCINOGENDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTHALLUCINOGENDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTHALLUCINOGENABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTHALLUCINOGENABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTOPIOIDDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTOPIOIDDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTOPIOIDABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTOPIOIDABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTPHENCYCLIDINEDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTPHENCYCLIDINEDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTPHENCYCLIDINEABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTPHENCYCLIDINEABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTSEDATIVEHYPNOTICANXIOLYTICDEPENDEN"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTSEDATIVEHYPNOTICANXIOLYTICDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTSEDATIVEHYPNOTICANXIOLYTICABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTSEDATIVEHYPNOTICANXIOLYTICABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTPOLYSUBSTANCEDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTPOLYSUBSTANCEDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTOTHERORUNKNOWNDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTOTHERORUNKNOWNDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTOTHERORUNKNOWNABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTOTHERORUNKNOWNABUSE"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_CURRENTPANICWITHAGORAPHOBIA"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_PASTPANICWITHAGORAPHOBIA"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_CURRENTPANICWITHOUTAGORAPHOBIA"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_PASTPANICWITHOUTAGORAPHOBIA"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_CURRENTAGORAPHOBIAWITHOUTPANICHX"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_PASTAGORAPHOBIAWITHOUTPANICHX"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_CURRENTSOCIALPHOBIA"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_PASTSOCIALPHOBIA"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_CURRENTSPECIFICPHOBIA"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_PASTSPECIFICPHOBIA"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_CURRENTOCD"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_PASTOCD"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_CURRENTPTSD"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_PASTPTSD"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_CURRENTGENERALIZEDANXIETYDISORDER"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_CURRENTANXIETYDUETOMEDICALCONDITION"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_PASTANXIETYDUETOMEDICALCONDITION"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_CURRENTSUBSTANCEINDUCEDANXIETYDISORDER"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_PASTSUBSTANCEINDUCEDANXIETYDISORDER"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_CURRENTANXIETYDISORDERNOS"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_PASTANXIETYDISORDERNOS"/>
-		<DisplayFieldRef id="SOMATOFORMDISORDERS_SOMATIZATIONDISORDER"/>
-		<DisplayFieldRef id="SOMATOFORMDISORDERS_UNDIFFERENTIATEDSOMATFORMDISORDER"/>
-		<DisplayFieldRef id="SOMATOFORMDISORDERS_PAINDISORDER"/>
-		<DisplayFieldRef id="SOMATOFORMDISORDERS_HYPOCHONDRIASIS"/>
-		<DisplayFieldRef id="SOMATOFORMDISORDERS_BODYDYSMORPHICDISORDER"/>
-		<DisplayFieldRef id="EATINGDISORDERS_CURRENTANOREXIANERVOSA"/>
-		<DisplayFieldRef id="EATINGDISORDERS_PASTANOREXIANERVOSA"/>
-		<DisplayFieldRef id="EATINGDISORDERS_CURRENTBULIMIANERVOSA"/>
-		<DisplayFieldRef id="EATINGDISORDERS_PASTBULIMIANERVOSA"/>
-		<DisplayFieldRef id="EATINGDISORDERS_CURRENTBINGEEATINGDISORDER"/>
-		<DisplayFieldRef id="EATINGDISORDERS_PASTBINGEEATINGDISORDER"/>
-		<DisplayFieldRef id="ADJUSTMENTDISORDER"/>
-		<DisplayFieldRef id="OPTIONAL_CURRENTACUTESTRESSDISORDER"/>
-		<DisplayFieldRef id="OPTIONAL_PASTACUTESTRESSDISORDER"/>
-		<DisplayFieldRef id="OPTIONAL_CURRENTMINORDEPRESSIVEDISORDER"/>
-		<DisplayFieldRef id="OPTIONAL_PASTMINORDEPRESSIVEDISORDER"/>
-		<DisplayFieldRef id="OPTIONAL_CURRENTMIXEDANXIETYDEPRESSIVEDISORDER"/>
-		<DisplayFieldRef id="OPTIONAL_PASTMIXEDANXIETYDEPRESSIVEDISORDER"/>
-		<DisplayFieldRef id="OPTIONAL_PASTSYMPOMATICDETAILS"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="SCID" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-		<DisplayFieldRef id="ADMINISTRATOR"/>
-		<DisplayFieldRef id="MOODEPISODES_CURRENTMAJORDEPRESSIVEEPISODE"/>
-		<DisplayFieldRef id="MOODEPISODES_PASTMAJORDEPRESSIVEEPISODE"/>
-		<DisplayFieldRef id="MOODEPISODES_CURRENTMANICEPISODE"/>
-		<DisplayFieldRef id="MOODEPISODES_PASTMANICEPISODE"/>
-		<DisplayFieldRef id="MOODEPISODES_CURRENTHYPOMANICEPISODE"/>
-		<DisplayFieldRef id="MOODEPISODES_PASTHYPOMANICEPISODE"/>
-		<DisplayFieldRef id="MOODEPISODES_CURRENTDYSTHMICEPISODE"/>
-		<DisplayFieldRef id="MOODEPISODES_CURRENTMOODDISORDERDUETOMEDICALCONDITION"/>
-		<DisplayFieldRef id="MOODEPISODES_PASTMOODDISORDERDUETOMEDICALCONDITION"/>
-		<DisplayFieldRef id="MOODEPISODES_CURRENTSUBSTANCEINDUCEDMOODDISORDER"/>
-		<DisplayFieldRef id="MOODEPISODES_PASTSUBSTANCEINDUCEDMOODDISORDER"/>
-		<DisplayFieldRef id="PSYCHOTICSYMPTOMS_CURRENTDELUSIONS"/>
-		<DisplayFieldRef id="PSYCHOTICSYMPTOMS_PASTDELUSIONS"/>
-		<DisplayFieldRef id="PSYCHOTICSYMPTOMS_CURRENTHALLUCINATIONS"/>
-		<DisplayFieldRef id="PSYCHOTICSYMPTOMS_PASTHALLUCINATIONS"/>
-		<DisplayFieldRef id="PSYCHOTICSYMPTOMS_CURRENTDISORGANIZEDSPEECHBEHAVIOR"/>
-		<DisplayFieldRef id="PSYCHOTICSYMPTOMS_PASTDISORGANIZEDSPEECHBEHAVIOR"/>
-		<DisplayFieldRef id="PSYCHOTICSYMPTOMS_CURRENTCATATONICBEHAVIOR"/>
-		<DisplayFieldRef id="PSYCHOTICSYMPTOMS_PASTCATATONICBEHAVIOR"/>
-		<DisplayFieldRef id="PSYCHOTICSYMPTOMS_CURRENTNEGATIVESYMPTOMS"/>
-		<DisplayFieldRef id="PSYCHOTICSYMPTOMS_PASTNEGATIVESYMPTOMS"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTSCHIZOPHRENIA"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_PASTSCHIZOPHRENIA"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTPARANOIDTYPE"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_PASTPARANOIDTYPE"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTCATATONICTYPE"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_PASTCATATONICTYPE"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTDISORGANIZEDTYPE"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_PASTDISORGANIZEDTYPE"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTUNDIFFERENTIATEDTYPE"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_PASTUNDIFFERENTIATEDTYPE"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTRESIDUALTYPE"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_PASTRESIDUALTYPE"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTSCHIZOPHRENIFORMDISORDER"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_PASTSCHIZOPHRENIFORMDISORDER"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTSCHIZOAFFECTIVEDISORDER"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_PASTSCHIZOAFFECTIVEDISORDER"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTDELUSIONALDISORDER"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_PASTDELUSIONALDISORDER"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTBRIEFPSYCHOTICDISORDER"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_PASTBRIEFPSYCHOTICDISORDER"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTPSYCHOTICDISORDERDUETOMEDICALCONDITIO"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_PASTPSYCHOTICDISORDERDUETOMEDICALCONDITION"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTSUBSTANCEINDUCEDPSYCHOTICDISORDER"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_PASTSUBSTANCEINDUCEDPSYCHOTICDISORDER"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTPSYCHOTICDISORDERNOS"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_PASTPSYCHOTICDISORDERNOS"/>
-		<DisplayFieldRef id="MOODDISORDERS_CURRENTBIPOLAR1DISORDER"/>
-		<DisplayFieldRef id="MOODDISORDERS_PASTBIPOLAR1DISORDER"/>
-		<DisplayFieldRef id="MOODDISORDERS_CURRENTBIPOLAR2DISORDER"/>
-		<DisplayFieldRef id="MOODDISORDERS_PASTBIPOLAR2DISORDER"/>
-		<DisplayFieldRef id="MOODDISORDERS_CURRENTOTHERBIPOLARDISORDER"/>
-		<DisplayFieldRef id="MOODDISORDERS_PASTOTHERBIPOLARDISORDER"/>
-		<DisplayFieldRef id="MOODDISORDERS_CURRENTMAJORDEPRESSIVEDISORDER"/>
-		<DisplayFieldRef id="MOODDISORDERS_PASTMAJORDEPRESSIVEDISORDER"/>
-		<DisplayFieldRef id="MOODDISORDERS_CURRENTDEPRESSIVEDISORDERNOS"/>
-		<DisplayFieldRef id="MOODDISORDERS_PASTDEPRESSIVEDISORDERNOS"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTALCOHOLDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTALCOHOLDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTALCOHOLABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTALCOHOLABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTAMPHETAMINEDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTAMPHETAMINEDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTAMPHETAMINEABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTAMPHETAMINEABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTCANNABISDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTCANNABISDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTCANNABISABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTCANNABISABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTCOCAINEDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTCOCAINEDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTCOCAINEABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTCOCAINEABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTHALLUCINOGENDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTHALLUCINOGENDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTHALLUCINOGENABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTHALLUCINOGENABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTOPIOIDDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTOPIOIDDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTOPIOIDABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTOPIOIDABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTPHENCYCLIDINEDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTPHENCYCLIDINEDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTPHENCYCLIDINEABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTPHENCYCLIDINEABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTSEDATIVEHYPNOTICANXIOLYTICDEPENDEN"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTSEDATIVEHYPNOTICANXIOLYTICDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTSEDATIVEHYPNOTICANXIOLYTICABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTSEDATIVEHYPNOTICANXIOLYTICABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTPOLYSUBSTANCEDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTPOLYSUBSTANCEDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTOTHERORUNKNOWNDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTOTHERORUNKNOWNDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTOTHERORUNKNOWNABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTOTHERORUNKNOWNABUSE"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_CURRENTPANICWITHAGORAPHOBIA"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_PASTPANICWITHAGORAPHOBIA"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_CURRENTPANICWITHOUTAGORAPHOBIA"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_PASTPANICWITHOUTAGORAPHOBIA"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_CURRENTAGORAPHOBIAWITHOUTPANICHX"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_PASTAGORAPHOBIAWITHOUTPANICHX"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_CURRENTSOCIALPHOBIA"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_PASTSOCIALPHOBIA"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_CURRENTSPECIFICPHOBIA"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_PASTSPECIFICPHOBIA"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_CURRENTOCD"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_PASTOCD"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_CURRENTPTSD"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_PASTPTSD"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_CURRENTGENERALIZEDANXIETYDISORDER"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_CURRENTANXIETYDUETOMEDICALCONDITION"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_PASTANXIETYDUETOMEDICALCONDITION"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_CURRENTSUBSTANCEINDUCEDANXIETYDISORDER"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_PASTSUBSTANCEINDUCEDANXIETYDISORDER"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_CURRENTANXIETYDISORDERNOS"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_PASTANXIETYDISORDERNOS"/>
-		<DisplayFieldRef id="SOMATOFORMDISORDERS_SOMATIZATIONDISORDER"/>
-		<DisplayFieldRef id="SOMATOFORMDISORDERS_UNDIFFERENTIATEDSOMATFORMDISORDER"/>
-		<DisplayFieldRef id="SOMATOFORMDISORDERS_PAINDISORDER"/>
-		<DisplayFieldRef id="SOMATOFORMDISORDERS_HYPOCHONDRIASIS"/>
-		<DisplayFieldRef id="SOMATOFORMDISORDERS_BODYDYSMORPHICDISORDER"/>
-		<DisplayFieldRef id="EATINGDISORDERS_CURRENTANOREXIANERVOSA"/>
-		<DisplayFieldRef id="EATINGDISORDERS_PASTANOREXIANERVOSA"/>
-		<DisplayFieldRef id="EATINGDISORDERS_CURRENTBULIMIANERVOSA"/>
-		<DisplayFieldRef id="EATINGDISORDERS_PASTBULIMIANERVOSA"/>
-		<DisplayFieldRef id="EATINGDISORDERS_CURRENTBINGEEATINGDISORDER"/>
-		<DisplayFieldRef id="EATINGDISORDERS_PASTBINGEEATINGDISORDER"/>
-		<DisplayFieldRef id="ADJUSTMENTDISORDER"/>
-		<DisplayFieldRef id="OPTIONAL_CURRENTACUTESTRESSDISORDER"/>
-		<DisplayFieldRef id="OPTIONAL_PASTACUTESTRESSDISORDER"/>
-		<DisplayFieldRef id="OPTIONAL_CURRENTMINORDEPRESSIVEDISORDER"/>
-		<DisplayFieldRef id="OPTIONAL_PASTMINORDEPRESSIVEDISORDER"/>
-		<DisplayFieldRef id="OPTIONAL_CURRENTMIXEDANXIETYDEPRESSIVEDISORDER"/>
-		<DisplayFieldRef id="OPTIONAL_PASTMIXEDANXIETYDEPRESSIVEDISORDER"/>
-		<DisplayFieldRef id="OPTIONAL_PASTSYMPOMATICDETAILS"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="SCID" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="EXPT_ID"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-		<DisplayFieldRef id="ADMINISTRATOR"/>
-		<DisplayFieldRef id="MOODEPISODES_CURRENTMAJORDEPRESSIVEEPISODE"/>
-		<DisplayFieldRef id="MOODEPISODES_PASTMAJORDEPRESSIVEEPISODE"/>
-		<DisplayFieldRef id="MOODEPISODES_CURRENTMANICEPISODE"/>
-		<DisplayFieldRef id="MOODEPISODES_PASTMANICEPISODE"/>
-		<DisplayFieldRef id="MOODEPISODES_CURRENTHYPOMANICEPISODE"/>
-		<DisplayFieldRef id="MOODEPISODES_PASTHYPOMANICEPISODE"/>
-		<DisplayFieldRef id="MOODEPISODES_CURRENTDYSTHMICEPISODE"/>
-		<DisplayFieldRef id="MOODEPISODES_CURRENTMOODDISORDERDUETOMEDICALCONDITION"/>
-		<DisplayFieldRef id="MOODEPISODES_PASTMOODDISORDERDUETOMEDICALCONDITION"/>
-		<DisplayFieldRef id="MOODEPISODES_CURRENTSUBSTANCEINDUCEDMOODDISORDER"/>
-		<DisplayFieldRef id="MOODEPISODES_PASTSUBSTANCEINDUCEDMOODDISORDER"/>
-		<DisplayFieldRef id="PSYCHOTICSYMPTOMS_CURRENTDELUSIONS"/>
-		<DisplayFieldRef id="PSYCHOTICSYMPTOMS_PASTDELUSIONS"/>
-		<DisplayFieldRef id="PSYCHOTICSYMPTOMS_CURRENTHALLUCINATIONS"/>
-		<DisplayFieldRef id="PSYCHOTICSYMPTOMS_PASTHALLUCINATIONS"/>
-		<DisplayFieldRef id="PSYCHOTICSYMPTOMS_CURRENTDISORGANIZEDSPEECHBEHAVIOR"/>
-		<DisplayFieldRef id="PSYCHOTICSYMPTOMS_PASTDISORGANIZEDSPEECHBEHAVIOR"/>
-		<DisplayFieldRef id="PSYCHOTICSYMPTOMS_CURRENTCATATONICBEHAVIOR"/>
-		<DisplayFieldRef id="PSYCHOTICSYMPTOMS_PASTCATATONICBEHAVIOR"/>
-		<DisplayFieldRef id="PSYCHOTICSYMPTOMS_CURRENTNEGATIVESYMPTOMS"/>
-		<DisplayFieldRef id="PSYCHOTICSYMPTOMS_PASTNEGATIVESYMPTOMS"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTSCHIZOPHRENIA"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_PASTSCHIZOPHRENIA"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTPARANOIDTYPE"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_PASTPARANOIDTYPE"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTCATATONICTYPE"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_PASTCATATONICTYPE"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTDISORGANIZEDTYPE"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_PASTDISORGANIZEDTYPE"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTUNDIFFERENTIATEDTYPE"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_PASTUNDIFFERENTIATEDTYPE"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTRESIDUALTYPE"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_PASTRESIDUALTYPE"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTSCHIZOPHRENIFORMDISORDER"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_PASTSCHIZOPHRENIFORMDISORDER"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTSCHIZOAFFECTIVEDISORDER"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_PASTSCHIZOAFFECTIVEDISORDER"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTDELUSIONALDISORDER"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_PASTDELUSIONALDISORDER"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTBRIEFPSYCHOTICDISORDER"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_PASTBRIEFPSYCHOTICDISORDER"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTPSYCHOTICDISORDERDUETOMEDICALCONDITIO"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_PASTPSYCHOTICDISORDERDUETOMEDICALCONDITION"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTSUBSTANCEINDUCEDPSYCHOTICDISORDER"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_PASTSUBSTANCEINDUCEDPSYCHOTICDISORDER"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTPSYCHOTICDISORDERNOS"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_PASTPSYCHOTICDISORDERNOS"/>
-		<DisplayFieldRef id="MOODDISORDERS_CURRENTBIPOLAR1DISORDER"/>
-		<DisplayFieldRef id="MOODDISORDERS_PASTBIPOLAR1DISORDER"/>
-		<DisplayFieldRef id="MOODDISORDERS_CURRENTBIPOLAR2DISORDER"/>
-		<DisplayFieldRef id="MOODDISORDERS_PASTBIPOLAR2DISORDER"/>
-		<DisplayFieldRef id="MOODDISORDERS_CURRENTOTHERBIPOLARDISORDER"/>
-		<DisplayFieldRef id="MOODDISORDERS_PASTOTHERBIPOLARDISORDER"/>
-		<DisplayFieldRef id="MOODDISORDERS_CURRENTMAJORDEPRESSIVEDISORDER"/>
-		<DisplayFieldRef id="MOODDISORDERS_PASTMAJORDEPRESSIVEDISORDER"/>
-		<DisplayFieldRef id="MOODDISORDERS_CURRENTDEPRESSIVEDISORDERNOS"/>
-		<DisplayFieldRef id="MOODDISORDERS_PASTDEPRESSIVEDISORDERNOS"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTALCOHOLDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTALCOHOLDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTALCOHOLABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTALCOHOLABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTAMPHETAMINEDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTAMPHETAMINEDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTAMPHETAMINEABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTAMPHETAMINEABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTCANNABISDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTCANNABISDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTCANNABISABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTCANNABISABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTCOCAINEDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTCOCAINEDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTCOCAINEABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTCOCAINEABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTHALLUCINOGENDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTHALLUCINOGENDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTHALLUCINOGENABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTHALLUCINOGENABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTOPIOIDDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTOPIOIDDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTOPIOIDABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTOPIOIDABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTPHENCYCLIDINEDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTPHENCYCLIDINEDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTPHENCYCLIDINEABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTPHENCYCLIDINEABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTSEDATIVEHYPNOTICANXIOLYTICDEPENDEN"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTSEDATIVEHYPNOTICANXIOLYTICDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTSEDATIVEHYPNOTICANXIOLYTICABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTSEDATIVEHYPNOTICANXIOLYTICABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTPOLYSUBSTANCEDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTPOLYSUBSTANCEDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTOTHERORUNKNOWNDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTOTHERORUNKNOWNDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTOTHERORUNKNOWNABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTOTHERORUNKNOWNABUSE"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_CURRENTPANICWITHAGORAPHOBIA"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_PASTPANICWITHAGORAPHOBIA"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_CURRENTPANICWITHOUTAGORAPHOBIA"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_PASTPANICWITHOUTAGORAPHOBIA"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_CURRENTAGORAPHOBIAWITHOUTPANICHX"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_PASTAGORAPHOBIAWITHOUTPANICHX"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_CURRENTSOCIALPHOBIA"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_PASTSOCIALPHOBIA"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_CURRENTSPECIFICPHOBIA"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_PASTSPECIFICPHOBIA"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_CURRENTOCD"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_PASTOCD"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_CURRENTPTSD"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_PASTPTSD"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_CURRENTGENERALIZEDANXIETYDISORDER"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_CURRENTANXIETYDUETOMEDICALCONDITION"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_PASTANXIETYDUETOMEDICALCONDITION"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_CURRENTSUBSTANCEINDUCEDANXIETYDISORDER"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_PASTSUBSTANCEINDUCEDANXIETYDISORDER"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_CURRENTANXIETYDISORDERNOS"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_PASTANXIETYDISORDERNOS"/>
-		<DisplayFieldRef id="SOMATOFORMDISORDERS_SOMATIZATIONDISORDER"/>
-		<DisplayFieldRef id="SOMATOFORMDISORDERS_UNDIFFERENTIATEDSOMATFORMDISORDER"/>
-		<DisplayFieldRef id="SOMATOFORMDISORDERS_PAINDISORDER"/>
-		<DisplayFieldRef id="SOMATOFORMDISORDERS_HYPOCHONDRIASIS"/>
-		<DisplayFieldRef id="SOMATOFORMDISORDERS_BODYDYSMORPHICDISORDER"/>
-		<DisplayFieldRef id="EATINGDISORDERS_CURRENTANOREXIANERVOSA"/>
-		<DisplayFieldRef id="EATINGDISORDERS_PASTANOREXIANERVOSA"/>
-		<DisplayFieldRef id="EATINGDISORDERS_CURRENTBULIMIANERVOSA"/>
-		<DisplayFieldRef id="EATINGDISORDERS_PASTBULIMIANERVOSA"/>
-		<DisplayFieldRef id="EATINGDISORDERS_CURRENTBINGEEATINGDISORDER"/>
-		<DisplayFieldRef id="EATINGDISORDERS_PASTBINGEEATINGDISORDER"/>
-		<DisplayFieldRef id="ADJUSTMENTDISORDER"/>
-		<DisplayFieldRef id="OPTIONAL_CURRENTACUTESTRESSDISORDER"/>
-		<DisplayFieldRef id="OPTIONAL_PASTACUTESTRESSDISORDER"/>
-		<DisplayFieldRef id="OPTIONAL_CURRENTMINORDEPRESSIVEDISORDER"/>
-		<DisplayFieldRef id="OPTIONAL_PASTMINORDEPRESSIVEDISORDER"/>
-		<DisplayFieldRef id="OPTIONAL_CURRENTMIXEDANXIETYDEPRESSIVEDISORDER"/>
-		<DisplayFieldRef id="OPTIONAL_PASTMIXEDANXIETYDEPRESSIVEDISORDER"/>
-		<DisplayFieldRef id="OPTIONAL_PASTSYMPOMATICDETAILS"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="SCID" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="ADMINISTRATOR"/>
-		<DisplayFieldRef id="MOODEPISODES_CURRENTMAJORDEPRESSIVEEPISODE"/>
-		<DisplayFieldRef id="MOODEPISODES_PASTMAJORDEPRESSIVEEPISODE"/>
-		<DisplayFieldRef id="MOODEPISODES_CURRENTMANICEPISODE"/>
-		<DisplayFieldRef id="MOODEPISODES_PASTMANICEPISODE"/>
-		<DisplayFieldRef id="MOODEPISODES_CURRENTHYPOMANICEPISODE"/>
-		<DisplayFieldRef id="MOODEPISODES_PASTHYPOMANICEPISODE"/>
-		<DisplayFieldRef id="MOODEPISODES_CURRENTDYSTHMICEPISODE"/>
-		<DisplayFieldRef id="MOODEPISODES_CURRENTMOODDISORDERDUETOMEDICALCONDITION"/>
-		<DisplayFieldRef id="MOODEPISODES_PASTMOODDISORDERDUETOMEDICALCONDITION"/>
-		<DisplayFieldRef id="MOODEPISODES_CURRENTSUBSTANCEINDUCEDMOODDISORDER"/>
-		<DisplayFieldRef id="MOODEPISODES_PASTSUBSTANCEINDUCEDMOODDISORDER"/>
-		<DisplayFieldRef id="PSYCHOTICSYMPTOMS_CURRENTDELUSIONS"/>
-		<DisplayFieldRef id="PSYCHOTICSYMPTOMS_PASTDELUSIONS"/>
-		<DisplayFieldRef id="PSYCHOTICSYMPTOMS_CURRENTHALLUCINATIONS"/>
-		<DisplayFieldRef id="PSYCHOTICSYMPTOMS_PASTHALLUCINATIONS"/>
-		<DisplayFieldRef id="PSYCHOTICSYMPTOMS_CURRENTDISORGANIZEDSPEECHBEHAVIOR"/>
-		<DisplayFieldRef id="PSYCHOTICSYMPTOMS_PASTDISORGANIZEDSPEECHBEHAVIOR"/>
-		<DisplayFieldRef id="PSYCHOTICSYMPTOMS_CURRENTCATATONICBEHAVIOR"/>
-		<DisplayFieldRef id="PSYCHOTICSYMPTOMS_PASTCATATONICBEHAVIOR"/>
-		<DisplayFieldRef id="PSYCHOTICSYMPTOMS_CURRENTNEGATIVESYMPTOMS"/>
-		<DisplayFieldRef id="PSYCHOTICSYMPTOMS_PASTNEGATIVESYMPTOMS"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTSCHIZOPHRENIA"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_PASTSCHIZOPHRENIA"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTPARANOIDTYPE"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_PASTPARANOIDTYPE"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTCATATONICTYPE"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_PASTCATATONICTYPE"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTDISORGANIZEDTYPE"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_PASTDISORGANIZEDTYPE"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTUNDIFFERENTIATEDTYPE"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_PASTUNDIFFERENTIATEDTYPE"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTRESIDUALTYPE"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_PASTRESIDUALTYPE"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTSCHIZOPHRENIFORMDISORDER"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_PASTSCHIZOPHRENIFORMDISORDER"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTSCHIZOAFFECTIVEDISORDER"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_PASTSCHIZOAFFECTIVEDISORDER"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTDELUSIONALDISORDER"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_PASTDELUSIONALDISORDER"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTBRIEFPSYCHOTICDISORDER"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_PASTBRIEFPSYCHOTICDISORDER"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTPSYCHOTICDISORDERDUETOMEDICALCONDITIO"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_PASTPSYCHOTICDISORDERDUETOMEDICALCONDITION"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTSUBSTANCEINDUCEDPSYCHOTICDISORDER"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_PASTSUBSTANCEINDUCEDPSYCHOTICDISORDER"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTPSYCHOTICDISORDERNOS"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_PASTPSYCHOTICDISORDERNOS"/>
-		<DisplayFieldRef id="MOODDISORDERS_CURRENTBIPOLAR1DISORDER"/>
-		<DisplayFieldRef id="MOODDISORDERS_PASTBIPOLAR1DISORDER"/>
-		<DisplayFieldRef id="MOODDISORDERS_CURRENTBIPOLAR2DISORDER"/>
-		<DisplayFieldRef id="MOODDISORDERS_PASTBIPOLAR2DISORDER"/>
-		<DisplayFieldRef id="MOODDISORDERS_CURRENTOTHERBIPOLARDISORDER"/>
-		<DisplayFieldRef id="MOODDISORDERS_PASTOTHERBIPOLARDISORDER"/>
-		<DisplayFieldRef id="MOODDISORDERS_CURRENTMAJORDEPRESSIVEDISORDER"/>
-		<DisplayFieldRef id="MOODDISORDERS_PASTMAJORDEPRESSIVEDISORDER"/>
-		<DisplayFieldRef id="MOODDISORDERS_CURRENTDEPRESSIVEDISORDERNOS"/>
-		<DisplayFieldRef id="MOODDISORDERS_PASTDEPRESSIVEDISORDERNOS"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTALCOHOLDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTALCOHOLDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTALCOHOLABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTALCOHOLABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTAMPHETAMINEDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTAMPHETAMINEDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTAMPHETAMINEABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTAMPHETAMINEABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTCANNABISDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTCANNABISDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTCANNABISABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTCANNABISABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTCOCAINEDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTCOCAINEDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTCOCAINEABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTCOCAINEABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTHALLUCINOGENDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTHALLUCINOGENDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTHALLUCINOGENABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTHALLUCINOGENABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTOPIOIDDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTOPIOIDDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTOPIOIDABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTOPIOIDABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTPHENCYCLIDINEDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTPHENCYCLIDINEDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTPHENCYCLIDINEABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTPHENCYCLIDINEABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTSEDATIVEHYPNOTICANXIOLYTICDEPENDEN"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTSEDATIVEHYPNOTICANXIOLYTICDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTSEDATIVEHYPNOTICANXIOLYTICABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTSEDATIVEHYPNOTICANXIOLYTICABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTPOLYSUBSTANCEDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTPOLYSUBSTANCEDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTOTHERORUNKNOWNDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTOTHERORUNKNOWNDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTOTHERORUNKNOWNABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTOTHERORUNKNOWNABUSE"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_CURRENTPANICWITHAGORAPHOBIA"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_PASTPANICWITHAGORAPHOBIA"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_CURRENTPANICWITHOUTAGORAPHOBIA"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_PASTPANICWITHOUTAGORAPHOBIA"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_CURRENTAGORAPHOBIAWITHOUTPANICHX"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_PASTAGORAPHOBIAWITHOUTPANICHX"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_CURRENTSOCIALPHOBIA"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_PASTSOCIALPHOBIA"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_CURRENTSPECIFICPHOBIA"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_PASTSPECIFICPHOBIA"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_CURRENTOCD"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_PASTOCD"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_CURRENTPTSD"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_PASTPTSD"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_CURRENTGENERALIZEDANXIETYDISORDER"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_CURRENTANXIETYDUETOMEDICALCONDITION"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_PASTANXIETYDUETOMEDICALCONDITION"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_CURRENTSUBSTANCEINDUCEDANXIETYDISORDER"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_PASTSUBSTANCEINDUCEDANXIETYDISORDER"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_CURRENTANXIETYDISORDERNOS"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_PASTANXIETYDISORDERNOS"/>
-		<DisplayFieldRef id="SOMATOFORMDISORDERS_SOMATIZATIONDISORDER"/>
-		<DisplayFieldRef id="SOMATOFORMDISORDERS_UNDIFFERENTIATEDSOMATFORMDISORDER"/>
-		<DisplayFieldRef id="SOMATOFORMDISORDERS_PAINDISORDER"/>
-		<DisplayFieldRef id="SOMATOFORMDISORDERS_HYPOCHONDRIASIS"/>
-		<DisplayFieldRef id="SOMATOFORMDISORDERS_BODYDYSMORPHICDISORDER"/>
-		<DisplayFieldRef id="EATINGDISORDERS_CURRENTANOREXIANERVOSA"/>
-		<DisplayFieldRef id="EATINGDISORDERS_PASTANOREXIANERVOSA"/>
-		<DisplayFieldRef id="EATINGDISORDERS_CURRENTBULIMIANERVOSA"/>
-		<DisplayFieldRef id="EATINGDISORDERS_PASTBULIMIANERVOSA"/>
-		<DisplayFieldRef id="EATINGDISORDERS_CURRENTBINGEEATINGDISORDER"/>
-		<DisplayFieldRef id="EATINGDISORDERS_PASTBINGEEATINGDISORDER"/>
-		<DisplayFieldRef id="ADJUSTMENTDISORDER"/>
-		<DisplayFieldRef id="OPTIONAL_CURRENTACUTESTRESSDISORDER"/>
-		<DisplayFieldRef id="OPTIONAL_PASTACUTESTRESSDISORDER"/>
-		<DisplayFieldRef id="OPTIONAL_CURRENTMINORDEPRESSIVEDISORDER"/>
-		<DisplayFieldRef id="OPTIONAL_PASTMINORDEPRESSIVEDISORDER"/>
-		<DisplayFieldRef id="OPTIONAL_CURRENTMIXEDANXIETYDEPRESSIVEDISORDER"/>
-		<DisplayFieldRef id="OPTIONAL_PASTMIXEDANXIETYDEPRESSIVEDISORDER"/>
-		<DisplayFieldRef id="OPTIONAL_PASTSYMPOMATICDETAILS"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="SCID" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="XNAT_A_SCIDRESEARCHDATA_PROJECT_IDENTIFIER"/>
-		<DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-		<DisplayFieldRef id="ADMINISTRATOR"/>
-		<DisplayFieldRef id="MOODEPISODES_CURRENTMAJORDEPRESSIVEEPISODE"/>
-		<DisplayFieldRef id="MOODEPISODES_PASTMAJORDEPRESSIVEEPISODE"/>
-		<DisplayFieldRef id="MOODEPISODES_CURRENTMANICEPISODE"/>
-		<DisplayFieldRef id="MOODEPISODES_PASTMANICEPISODE"/>
-		<DisplayFieldRef id="MOODEPISODES_CURRENTHYPOMANICEPISODE"/>
-		<DisplayFieldRef id="MOODEPISODES_PASTHYPOMANICEPISODE"/>
-		<DisplayFieldRef id="MOODEPISODES_CURRENTDYSTHMICEPISODE"/>
-		<DisplayFieldRef id="MOODEPISODES_CURRENTMOODDISORDERDUETOMEDICALCONDITION"/>
-		<DisplayFieldRef id="MOODEPISODES_PASTMOODDISORDERDUETOMEDICALCONDITION"/>
-		<DisplayFieldRef id="MOODEPISODES_CURRENTSUBSTANCEINDUCEDMOODDISORDER"/>
-		<DisplayFieldRef id="MOODEPISODES_PASTSUBSTANCEINDUCEDMOODDISORDER"/>
-		<DisplayFieldRef id="PSYCHOTICSYMPTOMS_CURRENTDELUSIONS"/>
-		<DisplayFieldRef id="PSYCHOTICSYMPTOMS_PASTDELUSIONS"/>
-		<DisplayFieldRef id="PSYCHOTICSYMPTOMS_CURRENTHALLUCINATIONS"/>
-		<DisplayFieldRef id="PSYCHOTICSYMPTOMS_PASTHALLUCINATIONS"/>
-		<DisplayFieldRef id="PSYCHOTICSYMPTOMS_CURRENTDISORGANIZEDSPEECHBEHAVIOR"/>
-		<DisplayFieldRef id="PSYCHOTICSYMPTOMS_PASTDISORGANIZEDSPEECHBEHAVIOR"/>
-		<DisplayFieldRef id="PSYCHOTICSYMPTOMS_CURRENTCATATONICBEHAVIOR"/>
-		<DisplayFieldRef id="PSYCHOTICSYMPTOMS_PASTCATATONICBEHAVIOR"/>
-		<DisplayFieldRef id="PSYCHOTICSYMPTOMS_CURRENTNEGATIVESYMPTOMS"/>
-		<DisplayFieldRef id="PSYCHOTICSYMPTOMS_PASTNEGATIVESYMPTOMS"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTSCHIZOPHRENIA"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_PASTSCHIZOPHRENIA"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTPARANOIDTYPE"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_PASTPARANOIDTYPE"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTCATATONICTYPE"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_PASTCATATONICTYPE"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTDISORGANIZEDTYPE"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_PASTDISORGANIZEDTYPE"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTUNDIFFERENTIATEDTYPE"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_PASTUNDIFFERENTIATEDTYPE"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTRESIDUALTYPE"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_PASTRESIDUALTYPE"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTSCHIZOPHRENIFORMDISORDER"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_PASTSCHIZOPHRENIFORMDISORDER"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTSCHIZOAFFECTIVEDISORDER"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_PASTSCHIZOAFFECTIVEDISORDER"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTDELUSIONALDISORDER"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_PASTDELUSIONALDISORDER"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTBRIEFPSYCHOTICDISORDER"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_PASTBRIEFPSYCHOTICDISORDER"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTPSYCHOTICDISORDERDUETOMEDICALCONDITIO"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_PASTPSYCHOTICDISORDERDUETOMEDICALCONDITION"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTSUBSTANCEINDUCEDPSYCHOTICDISORDER"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_PASTSUBSTANCEINDUCEDPSYCHOTICDISORDER"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTPSYCHOTICDISORDERNOS"/>
-		<DisplayFieldRef id="PSYCHOTICDISORDERS_PASTPSYCHOTICDISORDERNOS"/>
-		<DisplayFieldRef id="MOODDISORDERS_CURRENTBIPOLAR1DISORDER"/>
-		<DisplayFieldRef id="MOODDISORDERS_PASTBIPOLAR1DISORDER"/>
-		<DisplayFieldRef id="MOODDISORDERS_CURRENTBIPOLAR2DISORDER"/>
-		<DisplayFieldRef id="MOODDISORDERS_PASTBIPOLAR2DISORDER"/>
-		<DisplayFieldRef id="MOODDISORDERS_CURRENTOTHERBIPOLARDISORDER"/>
-		<DisplayFieldRef id="MOODDISORDERS_PASTOTHERBIPOLARDISORDER"/>
-		<DisplayFieldRef id="MOODDISORDERS_CURRENTMAJORDEPRESSIVEDISORDER"/>
-		<DisplayFieldRef id="MOODDISORDERS_PASTMAJORDEPRESSIVEDISORDER"/>
-		<DisplayFieldRef id="MOODDISORDERS_CURRENTDEPRESSIVEDISORDERNOS"/>
-		<DisplayFieldRef id="MOODDISORDERS_PASTDEPRESSIVEDISORDERNOS"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTALCOHOLDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTALCOHOLDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTALCOHOLABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTALCOHOLABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTAMPHETAMINEDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTAMPHETAMINEDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTAMPHETAMINEABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTAMPHETAMINEABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTCANNABISDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTCANNABISDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTCANNABISABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTCANNABISABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTCOCAINEDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTCOCAINEDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTCOCAINEABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTCOCAINEABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTHALLUCINOGENDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTHALLUCINOGENDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTHALLUCINOGENABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTHALLUCINOGENABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTOPIOIDDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTOPIOIDDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTOPIOIDABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTOPIOIDABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTPHENCYCLIDINEDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTPHENCYCLIDINEDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTPHENCYCLIDINEABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTPHENCYCLIDINEABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTSEDATIVEHYPNOTICANXIOLYTICDEPENDEN"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTSEDATIVEHYPNOTICANXIOLYTICDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTSEDATIVEHYPNOTICANXIOLYTICABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTSEDATIVEHYPNOTICANXIOLYTICABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTPOLYSUBSTANCEDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTPOLYSUBSTANCEDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTOTHERORUNKNOWNDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTOTHERORUNKNOWNDEPENDENCE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTOTHERORUNKNOWNABUSE"/>
-		<DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTOTHERORUNKNOWNABUSE"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_CURRENTPANICWITHAGORAPHOBIA"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_PASTPANICWITHAGORAPHOBIA"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_CURRENTPANICWITHOUTAGORAPHOBIA"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_PASTPANICWITHOUTAGORAPHOBIA"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_CURRENTAGORAPHOBIAWITHOUTPANICHX"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_PASTAGORAPHOBIAWITHOUTPANICHX"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_CURRENTSOCIALPHOBIA"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_PASTSOCIALPHOBIA"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_CURRENTSPECIFICPHOBIA"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_PASTSPECIFICPHOBIA"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_CURRENTOCD"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_PASTOCD"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_CURRENTPTSD"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_PASTPTSD"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_CURRENTGENERALIZEDANXIETYDISORDER"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_CURRENTANXIETYDUETOMEDICALCONDITION"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_PASTANXIETYDUETOMEDICALCONDITION"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_CURRENTSUBSTANCEINDUCEDANXIETYDISORDER"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_PASTSUBSTANCEINDUCEDANXIETYDISORDER"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_CURRENTANXIETYDISORDERNOS"/>
-		<DisplayFieldRef id="ANXIETYDISORDERS_PASTANXIETYDISORDERNOS"/>
-		<DisplayFieldRef id="SOMATOFORMDISORDERS_SOMATIZATIONDISORDER"/>
-		<DisplayFieldRef id="SOMATOFORMDISORDERS_UNDIFFERENTIATEDSOMATFORMDISORDER"/>
-		<DisplayFieldRef id="SOMATOFORMDISORDERS_PAINDISORDER"/>
-		<DisplayFieldRef id="SOMATOFORMDISORDERS_HYPOCHONDRIASIS"/>
-		<DisplayFieldRef id="SOMATOFORMDISORDERS_BODYDYSMORPHICDISORDER"/>
-		<DisplayFieldRef id="EATINGDISORDERS_CURRENTANOREXIANERVOSA"/>
-		<DisplayFieldRef id="EATINGDISORDERS_PASTANOREXIANERVOSA"/>
-		<DisplayFieldRef id="EATINGDISORDERS_CURRENTBULIMIANERVOSA"/>
-		<DisplayFieldRef id="EATINGDISORDERS_PASTBULIMIANERVOSA"/>
-		<DisplayFieldRef id="EATINGDISORDERS_CURRENTBINGEEATINGDISORDER"/>
-		<DisplayFieldRef id="EATINGDISORDERS_PASTBINGEEATINGDISORDER"/>
-		<DisplayFieldRef id="ADJUSTMENTDISORDER"/>
-		<DisplayFieldRef id="OPTIONAL_CURRENTACUTESTRESSDISORDER"/>
-		<DisplayFieldRef id="OPTIONAL_PASTACUTESTRESSDISORDER"/>
-		<DisplayFieldRef id="OPTIONAL_CURRENTMINORDEPRESSIVEDISORDER"/>
-		<DisplayFieldRef id="OPTIONAL_PASTMINORDEPRESSIVEDISORDER"/>
-		<DisplayFieldRef id="OPTIONAL_CURRENTMIXEDANXIETYDEPRESSIVEDISORDER"/>
-		<DisplayFieldRef id="OPTIONAL_PASTMIXEDANXIETYDEPRESSIVEDISORDER"/>
-		<DisplayFieldRef id="OPTIONAL_PASTSYMPOMATICDETAILS"/>
-	</DisplayVersion>
-	<ViewLink alias="XNAT_A_SCIDRESEARCHDATA_PROJECTS">
-		<Mapping TableName="XNAT_A_SCIDRESEARCHDATA_PROJECTS">
-			<MappingColumn rootElement="xnat_a:scidResearchData" fieldElement="xnat_a:scidResearchData.ID" mapsTo="id"/>
-		</Mapping>
-	</ViewLink>
-	<SQLView name="XNAT_A_SCIDRESEARCHDATA_PROJECTS" sql="SELECT id, '&lt;' || expt.project || '&gt;' || xs_a_concat(',&lt;' || shared.project || '&gt;') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat_a:scidResearchData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/assessments/display/xnat_a_sideEffectsPittsburghData_display.xml b/src/main/webapp/schemas/assessments/display/xnat_a_sideEffectsPittsburghData_display.xml
deleted file mode 100644
index 58bc5189..00000000
--- a/src/main/webapp/schemas/assessments/display/xnat_a_sideEffectsPittsburghData_display.xml
+++ /dev/null
@@ -1,287 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat_a:sideEffectsPittsburghData" full-description="SideEffectsPittsburgh" brief-description="SideEffectsPittsburgh">
-	<Arc name="PARTICIPANT_EXPERIMENT">
-		<CommonField id="PART_ID" local-field="SUBJECT_ID"/>
-		<CommonField id="DATE" local-field="DATE"/>
-		<CommonField id="EXPT_ID" local-field="EXPT_ID"/>
-	</Arc>
-	<DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:sideEffectsPittsburghData.subject_ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
-				<InsertValue id="Field1" field="SUBJECT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:sideEffectsPittsburghData.ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat_a:sideEffectsPittsburghData','xnat_a:sideEffectsPittsburghData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="RPT" header="ID" visible="true" image="true">
-		<Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat_a:sideEffectsPittsburghData','xnat_a:sideEffectsPittsburghData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="DATE" header="Date" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:sideEffectsPittsburghData.date"/>
-	</DisplayField>
-	<DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
-	<DisplayFieldElement name="Field1" schema-element="xnat_a:sideEffectsPittsburghData.date"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
-	<DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
-	<Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
-	</DisplayField>
-	<DisplayField header="Projects" id="PROJECTS" data-type="string">
-		<DisplayFieldElement name="Field1" viewName="XNAT_A_SIDEEFFECTSPITTSBURGHDATA_PROJECTS" viewColumn="PROJECTS"/>
-	</DisplayField>
-	<DisplayField header="Label" id="LABEL" data-type="string">
-	<DisplayFieldElement name="Field1" schema-element="xnat_a:sideEffectsPittsburghData.ID"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat_a:sideEffectsPittsburghData.label"/>
-	<Content type="sql">COALESCE(@Field2, @Field1)</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat_a:sideEffectsPittsburghData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat_a:sideEffectsPittsburghData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat_a:sideEffectsPittsburghData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat_a:sideEffectsPittsburghData/search_field/xnat_a:sideEffectsPittsburghData.ID">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat_a:sideEffectsPittsburghData','xnat_a:sideEffectsPittsburghData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="TITLE" value="Inserted: @Field1 (@Field2)">
-				<InsertValue id="Field1" field="INSERT_DATE"/>
-				<InsertValue id="Field2" field="INSERT_USER"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:sideEffectsPittsburghData.project"/>
-	</DisplayField>
-	<DisplayField id="XNAT_A_SIDEEFFECTSPITTSBURGHDATA_PROJECT_IDENTIFIER" header="XNAT_A_SIDEEFFECTSPITTSBURGHDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">xnat_a_sideeffectspittsburghdata_project_id</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat_a:sideEffectsPittsburghData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat_a:sideEffectsPittsburghData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat_a:sideEffectsPittsburghData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat_a:sideEffectsPittsburghData/search_field/xnat_a:sideEffectsPittsburghData.ID/project/@Field2">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-				<InsertValue id="Field2" field="@WHERE"/>
-			</Property>
-		</HTML-Link>
-		<SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_a_sideeffectspittsburghdata_project_id,sharing_share_xnat_experimentda_id FROM (	SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE'	UNION 	SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat_a:sideEffectsPittsburghData.ID" queryField="sharing_share_xnat_experimentda_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:sideEffectsPittsburghData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:sideEffectsPittsburghData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayField id="XNAT_A_SIDEEFFECTSPITTSBURGHDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">field</Content>
-		<SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat_a:sideEffectsPittsburghData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat_a:sideEffectsPittsburghData.ID" queryField="expt_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayField id="MOTORTICS" header="motorTics" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:sideEffectsPittsburghData/motorTics"/>
-	</DisplayField>
-	<DisplayField id="BUCCAL_LINGUALMOVEMENTS" header="buccal_lingualMovements" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:sideEffectsPittsburghData/buccal_lingualMovements"/>
-	</DisplayField>
-	<DisplayField id="PICKING_SKIN_FINGERS_NAILS_LIP" header="picking_skin_fingers_nails_lip" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:sideEffectsPittsburghData/picking_skin_fingers_nails_lip"/>
-	</DisplayField>
-	<DisplayField id="WORRIED_ANXIOUS" header="worried_anxious" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:sideEffectsPittsburghData/worried_anxious"/>
-	</DisplayField>
-	<DisplayField id="DULL_TIRED_LISTLESS" header="dull_tired_listless" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:sideEffectsPittsburghData/dull_tired_listless"/>
-	</DisplayField>
-	<DisplayField id="SEDATION" header="sedation" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:sideEffectsPittsburghData/sedation"/>
-	</DisplayField>
-	<DisplayField id="STOMACHACHE" header="stomachache" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:sideEffectsPittsburghData/stomachache"/>
-	</DisplayField>
-	<DisplayField id="NAUSEA_VOMITING" header="nausea_vomiting" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:sideEffectsPittsburghData/nausea_vomiting"/>
-	</DisplayField>
-	<DisplayField id="CRABBY_IRRITABLE" header="crabby_irritable" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:sideEffectsPittsburghData/crabby_irritable"/>
-	</DisplayField>
-	<DisplayField id="TEARFUL_SAD_DEPRESSED" header="tearful_sad_depressed" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:sideEffectsPittsburghData/tearful_sad_depressed"/>
-	</DisplayField>
-	<DisplayField id="HALLUCINATIONS" header="hallucinations" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:sideEffectsPittsburghData/hallucinations"/>
-	</DisplayField>
-	<DisplayField id="TROUBLESLEEPING" header="troubleSleeping" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:sideEffectsPittsburghData/troubleSleeping"/>
-	</DisplayField>
-	<DisplayField id="LOSSOFAPPETITE" header="lossOfAppetite" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:sideEffectsPittsburghData/lossOfAppetite"/>
-	</DisplayField>
-	<DisplayField id="TROUBLECONCENTRATING_DISTRACTIBLE" header="troubleConcentrating_distractible" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:sideEffectsPittsburghData/troubleConcentrating_distractible"/>
-	</DisplayField>
-	<DisplayField id="DIZZINESS_LIGHTHEADEDNESS" header="dizziness_lightheadedness" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:sideEffectsPittsburghData/dizziness_lightheadedness"/>
-	</DisplayField>
-	<DisplayField id="HEADACHES" header="headaches" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:sideEffectsPittsburghData/headaches"/>
-	</DisplayField>
-	<DisplayField id="SOCIALWITHDRAWAL" header="socialWithdrawal" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:sideEffectsPittsburghData/socialWithdrawal"/>
-	</DisplayField>
-	<DisplayField id="DRYMOUTH" header="dryMouth" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:sideEffectsPittsburghData/dryMouth"/>
-	</DisplayField>
-	<DisplayField id="PALPITATIONS" header="palpitations" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:sideEffectsPittsburghData/palpitations"/>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="SideEffectsPittsburgh" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="RPT"/>
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="AGE"/>
-		<DisplayFieldRef id="MOTORTICS"/>
-		<DisplayFieldRef id="BUCCAL_LINGUALMOVEMENTS"/>
-		<DisplayFieldRef id="PICKING_SKIN_FINGERS_NAILS_LIP"/>
-		<DisplayFieldRef id="WORRIED_ANXIOUS"/>
-		<DisplayFieldRef id="DULL_TIRED_LISTLESS"/>
-		<DisplayFieldRef id="SEDATION"/>
-		<DisplayFieldRef id="STOMACHACHE"/>
-		<DisplayFieldRef id="NAUSEA_VOMITING"/>
-		<DisplayFieldRef id="CRABBY_IRRITABLE"/>
-		<DisplayFieldRef id="TEARFUL_SAD_DEPRESSED"/>
-		<DisplayFieldRef id="HALLUCINATIONS"/>
-		<DisplayFieldRef id="TROUBLESLEEPING"/>
-		<DisplayFieldRef id="LOSSOFAPPETITE"/>
-		<DisplayFieldRef id="TROUBLECONCENTRATING_DISTRACTIBLE"/>
-		<DisplayFieldRef id="DIZZINESS_LIGHTHEADEDNESS"/>
-		<DisplayFieldRef id="HEADACHES"/>
-		<DisplayFieldRef id="SOCIALWITHDRAWAL"/>
-		<DisplayFieldRef id="DRYMOUTH"/>
-		<DisplayFieldRef id="PALPITATIONS"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="SideEffectsPittsburgh" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-		<DisplayFieldRef id="MOTORTICS"/>
-		<DisplayFieldRef id="BUCCAL_LINGUALMOVEMENTS"/>
-		<DisplayFieldRef id="PICKING_SKIN_FINGERS_NAILS_LIP"/>
-		<DisplayFieldRef id="WORRIED_ANXIOUS"/>
-		<DisplayFieldRef id="DULL_TIRED_LISTLESS"/>
-		<DisplayFieldRef id="SEDATION"/>
-		<DisplayFieldRef id="STOMACHACHE"/>
-		<DisplayFieldRef id="NAUSEA_VOMITING"/>
-		<DisplayFieldRef id="CRABBY_IRRITABLE"/>
-		<DisplayFieldRef id="TEARFUL_SAD_DEPRESSED"/>
-		<DisplayFieldRef id="HALLUCINATIONS"/>
-		<DisplayFieldRef id="TROUBLESLEEPING"/>
-		<DisplayFieldRef id="LOSSOFAPPETITE"/>
-		<DisplayFieldRef id="TROUBLECONCENTRATING_DISTRACTIBLE"/>
-		<DisplayFieldRef id="DIZZINESS_LIGHTHEADEDNESS"/>
-		<DisplayFieldRef id="HEADACHES"/>
-		<DisplayFieldRef id="SOCIALWITHDRAWAL"/>
-		<DisplayFieldRef id="DRYMOUTH"/>
-		<DisplayFieldRef id="PALPITATIONS"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="SideEffectsPittsburgh" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="EXPT_ID"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-		<DisplayFieldRef id="MOTORTICS"/>
-		<DisplayFieldRef id="BUCCAL_LINGUALMOVEMENTS"/>
-		<DisplayFieldRef id="PICKING_SKIN_FINGERS_NAILS_LIP"/>
-		<DisplayFieldRef id="WORRIED_ANXIOUS"/>
-		<DisplayFieldRef id="DULL_TIRED_LISTLESS"/>
-		<DisplayFieldRef id="SEDATION"/>
-		<DisplayFieldRef id="STOMACHACHE"/>
-		<DisplayFieldRef id="NAUSEA_VOMITING"/>
-		<DisplayFieldRef id="CRABBY_IRRITABLE"/>
-		<DisplayFieldRef id="TEARFUL_SAD_DEPRESSED"/>
-		<DisplayFieldRef id="HALLUCINATIONS"/>
-		<DisplayFieldRef id="TROUBLESLEEPING"/>
-		<DisplayFieldRef id="LOSSOFAPPETITE"/>
-		<DisplayFieldRef id="TROUBLECONCENTRATING_DISTRACTIBLE"/>
-		<DisplayFieldRef id="DIZZINESS_LIGHTHEADEDNESS"/>
-		<DisplayFieldRef id="HEADACHES"/>
-		<DisplayFieldRef id="SOCIALWITHDRAWAL"/>
-		<DisplayFieldRef id="DRYMOUTH"/>
-		<DisplayFieldRef id="PALPITATIONS"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="SideEffectsPittsburgh" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="MOTORTICS"/>
-		<DisplayFieldRef id="BUCCAL_LINGUALMOVEMENTS"/>
-		<DisplayFieldRef id="PICKING_SKIN_FINGERS_NAILS_LIP"/>
-		<DisplayFieldRef id="WORRIED_ANXIOUS"/>
-		<DisplayFieldRef id="DULL_TIRED_LISTLESS"/>
-		<DisplayFieldRef id="SEDATION"/>
-		<DisplayFieldRef id="STOMACHACHE"/>
-		<DisplayFieldRef id="NAUSEA_VOMITING"/>
-		<DisplayFieldRef id="CRABBY_IRRITABLE"/>
-		<DisplayFieldRef id="TEARFUL_SAD_DEPRESSED"/>
-		<DisplayFieldRef id="HALLUCINATIONS"/>
-		<DisplayFieldRef id="TROUBLESLEEPING"/>
-		<DisplayFieldRef id="LOSSOFAPPETITE"/>
-		<DisplayFieldRef id="TROUBLECONCENTRATING_DISTRACTIBLE"/>
-		<DisplayFieldRef id="DIZZINESS_LIGHTHEADEDNESS"/>
-		<DisplayFieldRef id="HEADACHES"/>
-		<DisplayFieldRef id="SOCIALWITHDRAWAL"/>
-		<DisplayFieldRef id="DRYMOUTH"/>
-		<DisplayFieldRef id="PALPITATIONS"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="SideEffectsPittsburgh" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="XNAT_A_SIDEEFFECTSPITTSBURGHDATA_PROJECT_IDENTIFIER"/>
-		<DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-		<DisplayFieldRef id="MOTORTICS"/>
-		<DisplayFieldRef id="BUCCAL_LINGUALMOVEMENTS"/>
-		<DisplayFieldRef id="PICKING_SKIN_FINGERS_NAILS_LIP"/>
-		<DisplayFieldRef id="WORRIED_ANXIOUS"/>
-		<DisplayFieldRef id="DULL_TIRED_LISTLESS"/>
-		<DisplayFieldRef id="SEDATION"/>
-		<DisplayFieldRef id="STOMACHACHE"/>
-		<DisplayFieldRef id="NAUSEA_VOMITING"/>
-		<DisplayFieldRef id="CRABBY_IRRITABLE"/>
-		<DisplayFieldRef id="TEARFUL_SAD_DEPRESSED"/>
-		<DisplayFieldRef id="HALLUCINATIONS"/>
-		<DisplayFieldRef id="TROUBLESLEEPING"/>
-		<DisplayFieldRef id="LOSSOFAPPETITE"/>
-		<DisplayFieldRef id="TROUBLECONCENTRATING_DISTRACTIBLE"/>
-		<DisplayFieldRef id="DIZZINESS_LIGHTHEADEDNESS"/>
-		<DisplayFieldRef id="HEADACHES"/>
-		<DisplayFieldRef id="SOCIALWITHDRAWAL"/>
-		<DisplayFieldRef id="DRYMOUTH"/>
-		<DisplayFieldRef id="PALPITATIONS"/>
-	</DisplayVersion>
-	<ViewLink alias="XNAT_A_SIDEEFFECTSPITTSBURGHDATA_PROJECTS">
-		<Mapping TableName="XNAT_A_SIDEEFFECTSPITTSBURGHDATA_PROJECTS">
-			<MappingColumn rootElement="xnat_a:sideEffectsPittsburghData" fieldElement="xnat_a:sideEffectsPittsburghData.ID" mapsTo="id"/>
-		</Mapping>
-	</ViewLink>
-	<SQLView name="XNAT_A_SIDEEFFECTSPITTSBURGHDATA_PROJECTS" sql="SELECT id, '&lt;' || expt.project || '&gt;' || xs_a_concat(',&lt;' || shared.project || '&gt;') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat_a:sideEffectsPittsburghData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/assessments/display/xnat_a_updrs3Data_display.xml b/src/main/webapp/schemas/assessments/display/xnat_a_updrs3Data_display.xml
deleted file mode 100644
index 0a53eb90..00000000
--- a/src/main/webapp/schemas/assessments/display/xnat_a_updrs3Data_display.xml
+++ /dev/null
@@ -1,399 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat_a:updrs3Data" full-description="UPDRS3" brief-description="UPDRS3">
-	<Arc name="PARTICIPANT_EXPERIMENT">
-		<CommonField id="PART_ID" local-field="SUBJECT_ID"/>
-		<CommonField id="DATE" local-field="DATE"/>
-		<CommonField id="EXPT_ID" local-field="EXPT_ID"/>
-	</Arc>
-	<DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data.subject_ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
-				<InsertValue id="Field1" field="SUBJECT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data.ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat_a:updrs3Data','xnat_a:updrs3Data.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="RPT" header="ID" visible="true" image="true">
-		<Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat_a:updrs3Data','xnat_a:updrs3Data.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="DATE" header="Date" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data.date"/>
-	</DisplayField>
-	<DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
-	<DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data.date"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
-	<DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
-	<Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
-	</DisplayField>
-	<DisplayField header="Projects" id="PROJECTS" data-type="string">
-		<DisplayFieldElement name="Field1" viewName="XNAT_A_UPDRS3DATA_PROJECTS" viewColumn="PROJECTS"/>
-	</DisplayField>
-	<DisplayField header="Label" id="LABEL" data-type="string">
-	<DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data.ID"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat_a:updrs3Data.label"/>
-	<Content type="sql">COALESCE(@Field2, @Field1)</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat_a:updrs3Data">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat_a:updrs3Data/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat_a:updrs3Data/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat_a:updrs3Data/search_field/xnat_a:updrs3Data.ID">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat_a:updrs3Data','xnat_a:updrs3Data.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="TITLE" value="Inserted: @Field1 (@Field2)">
-				<InsertValue id="Field1" field="INSERT_DATE"/>
-				<InsertValue id="Field2" field="INSERT_USER"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data.project"/>
-	</DisplayField>
-	<DisplayField id="XNAT_A_UPDRS3DATA_PROJECT_IDENTIFIER" header="XNAT_A_UPDRS3DATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">xnat_a_updrs3data_project_id</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat_a:updrs3Data">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat_a:updrs3Data/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat_a:updrs3Data/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat_a:updrs3Data/search_field/xnat_a:updrs3Data.ID/project/@Field2">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-				<InsertValue id="Field2" field="@WHERE"/>
-			</Property>
-		</HTML-Link>
-		<SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_a_updrs3data_project_id,sharing_share_xnat_experimentda_id FROM (	SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE'	UNION 	SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat_a:updrs3Data.ID" queryField="sharing_share_xnat_experimentda_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayField id="XNAT_A_UPDRS3DATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">field</Content>
-		<SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat_a:updrs3Data') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat_a:updrs3Data.ID" queryField="expt_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayField id="INSCANNER" header="inScanner" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/inScanner"/>
-	</DisplayField>
-	<DisplayField id="CLICKER_RIGHT" header="right" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/clicker/right"/>
-	</DisplayField>
-	<DisplayField id="CLICKER_LEFT" header="left" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/clicker/left"/>
-	</DisplayField>
-	<DisplayField id="CLICKER_INTERVAL" header="interval" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/clicker/interval"/>
-	</DisplayField>
-	<DisplayField id="TREMORREST_FACE" header="face" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/tremorRest/face"/>
-	</DisplayField>
-	<DisplayField id="TREMORREST_RUE" header="rue" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/tremorRest/rue"/>
-	</DisplayField>
-	<DisplayField id="TREMORREST_LUE" header="lue" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/tremorRest/lue"/>
-	</DisplayField>
-	<DisplayField id="TREMORREST_RLE" header="rle" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/tremorRest/rle"/>
-	</DisplayField>
-	<DisplayField id="TREMORREST_LLE" header="lle" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/tremorRest/lle"/>
-	</DisplayField>
-	<DisplayField id="RIGIDITY_NECK" header="neck" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/rigidity/neck"/>
-	</DisplayField>
-	<DisplayField id="RIGIDITY_RUE" header="rue" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/rigidity/rue"/>
-	</DisplayField>
-	<DisplayField id="RIGIDITY_LUE" header="lue" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/rigidity/lue"/>
-	</DisplayField>
-	<DisplayField id="RIGIDITY_RLE" header="rle" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/rigidity/rle"/>
-	</DisplayField>
-	<DisplayField id="RIGIDITY_LLE" header="lle" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/rigidity/lle"/>
-	</DisplayField>
-	<DisplayField id="HANDMOVEMENTSGRIP_RIGHT" header="right" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/handMovementsGrip/right"/>
-	</DisplayField>
-	<DisplayField id="HANDMOVEMENTSGRIP_LEFT" header="left" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/handMovementsGrip/left"/>
-	</DisplayField>
-	<DisplayField id="FACIALEXPRESSION" header="facialExpression" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/facialExpression"/>
-	</DisplayField>
-	<DisplayField id="GAIT" header="gait" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/gait"/>
-	</DisplayField>
-	<DisplayField id="SPEECH" header="speech" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/speech"/>
-	</DisplayField>
-	<DisplayField id="WRITING" header="writing" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/writing"/>
-	</DisplayField>
-	<DisplayField id="ARISEFROMCHAIR" header="ariseFromChair" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/ariseFromChair"/>
-	</DisplayField>
-	<DisplayField id="ACTIONPOSTURALTREMOR_RIGHT" header="right" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/actionPosturalTremor/right"/>
-	</DisplayField>
-	<DisplayField id="ACTIONPOSTURALTREMOR_LEFT" header="left" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/actionPosturalTremor/left"/>
-	</DisplayField>
-	<DisplayField id="HANDSRAM_RIGHT" header="right" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/handsRAM/right"/>
-	</DisplayField>
-	<DisplayField id="HANDSRAM_LEFT" header="left" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/handsRAM/left"/>
-	</DisplayField>
-	<DisplayField id="FINGERTAPS_RIGHT" header="right" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/fingerTaps/right"/>
-	</DisplayField>
-	<DisplayField id="FINGERTAPS_LEFT" header="left" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/fingerTaps/left"/>
-	</DisplayField>
-	<DisplayField id="POSTURE" header="posture" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/posture"/>
-	</DisplayField>
-	<DisplayField id="POSTURALSTABILITY" header="posturalStability" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/posturalStability"/>
-	</DisplayField>
-	<DisplayField id="FOOTTAPS_RIGHT" header="right" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/footTaps/right"/>
-	</DisplayField>
-	<DisplayField id="FOOTTAPS_LEFT" header="left" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/footTaps/left"/>
-	</DisplayField>
-	<DisplayField id="BODYBRADYKINESIAHYPOKINESIA" header="bodyBradykinesiaHypokinesia" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/bodyBradykinesiaHypokinesia"/>
-	</DisplayField>
-	<DisplayField id="PROBLEM" header="problem" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/problem"/>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="UPDRS3" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="RPT"/>
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="AGE"/>
-		<DisplayFieldRef id="INSCANNER"/>
-		<DisplayFieldRef id="CLICKER_RIGHT"/>
-		<DisplayFieldRef id="CLICKER_LEFT"/>
-		<DisplayFieldRef id="CLICKER_INTERVAL"/>
-		<DisplayFieldRef id="TREMORREST_FACE"/>
-		<DisplayFieldRef id="TREMORREST_RUE"/>
-		<DisplayFieldRef id="TREMORREST_LUE"/>
-		<DisplayFieldRef id="TREMORREST_RLE"/>
-		<DisplayFieldRef id="TREMORREST_LLE"/>
-		<DisplayFieldRef id="RIGIDITY_NECK"/>
-		<DisplayFieldRef id="RIGIDITY_RUE"/>
-		<DisplayFieldRef id="RIGIDITY_LUE"/>
-		<DisplayFieldRef id="RIGIDITY_RLE"/>
-		<DisplayFieldRef id="RIGIDITY_LLE"/>
-		<DisplayFieldRef id="HANDMOVEMENTSGRIP_RIGHT"/>
-		<DisplayFieldRef id="HANDMOVEMENTSGRIP_LEFT"/>
-		<DisplayFieldRef id="FACIALEXPRESSION"/>
-		<DisplayFieldRef id="GAIT"/>
-		<DisplayFieldRef id="SPEECH"/>
-		<DisplayFieldRef id="WRITING"/>
-		<DisplayFieldRef id="ARISEFROMCHAIR"/>
-		<DisplayFieldRef id="ACTIONPOSTURALTREMOR_RIGHT"/>
-		<DisplayFieldRef id="ACTIONPOSTURALTREMOR_LEFT"/>
-		<DisplayFieldRef id="HANDSRAM_RIGHT"/>
-		<DisplayFieldRef id="HANDSRAM_LEFT"/>
-		<DisplayFieldRef id="FINGERTAPS_RIGHT"/>
-		<DisplayFieldRef id="FINGERTAPS_LEFT"/>
-		<DisplayFieldRef id="POSTURE"/>
-		<DisplayFieldRef id="POSTURALSTABILITY"/>
-		<DisplayFieldRef id="FOOTTAPS_RIGHT"/>
-		<DisplayFieldRef id="FOOTTAPS_LEFT"/>
-		<DisplayFieldRef id="BODYBRADYKINESIAHYPOKINESIA"/>
-		<DisplayFieldRef id="PROBLEM"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="UPDRS3" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-		<DisplayFieldRef id="INSCANNER"/>
-		<DisplayFieldRef id="CLICKER_RIGHT"/>
-		<DisplayFieldRef id="CLICKER_LEFT"/>
-		<DisplayFieldRef id="CLICKER_INTERVAL"/>
-		<DisplayFieldRef id="TREMORREST_FACE"/>
-		<DisplayFieldRef id="TREMORREST_RUE"/>
-		<DisplayFieldRef id="TREMORREST_LUE"/>
-		<DisplayFieldRef id="TREMORREST_RLE"/>
-		<DisplayFieldRef id="TREMORREST_LLE"/>
-		<DisplayFieldRef id="RIGIDITY_NECK"/>
-		<DisplayFieldRef id="RIGIDITY_RUE"/>
-		<DisplayFieldRef id="RIGIDITY_LUE"/>
-		<DisplayFieldRef id="RIGIDITY_RLE"/>
-		<DisplayFieldRef id="RIGIDITY_LLE"/>
-		<DisplayFieldRef id="HANDMOVEMENTSGRIP_RIGHT"/>
-		<DisplayFieldRef id="HANDMOVEMENTSGRIP_LEFT"/>
-		<DisplayFieldRef id="FACIALEXPRESSION"/>
-		<DisplayFieldRef id="GAIT"/>
-		<DisplayFieldRef id="SPEECH"/>
-		<DisplayFieldRef id="WRITING"/>
-		<DisplayFieldRef id="ARISEFROMCHAIR"/>
-		<DisplayFieldRef id="ACTIONPOSTURALTREMOR_RIGHT"/>
-		<DisplayFieldRef id="ACTIONPOSTURALTREMOR_LEFT"/>
-		<DisplayFieldRef id="HANDSRAM_RIGHT"/>
-		<DisplayFieldRef id="HANDSRAM_LEFT"/>
-		<DisplayFieldRef id="FINGERTAPS_RIGHT"/>
-		<DisplayFieldRef id="FINGERTAPS_LEFT"/>
-		<DisplayFieldRef id="POSTURE"/>
-		<DisplayFieldRef id="POSTURALSTABILITY"/>
-		<DisplayFieldRef id="FOOTTAPS_RIGHT"/>
-		<DisplayFieldRef id="FOOTTAPS_LEFT"/>
-		<DisplayFieldRef id="BODYBRADYKINESIAHYPOKINESIA"/>
-		<DisplayFieldRef id="PROBLEM"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="UPDRS3" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="EXPT_ID"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-		<DisplayFieldRef id="INSCANNER"/>
-		<DisplayFieldRef id="CLICKER_RIGHT"/>
-		<DisplayFieldRef id="CLICKER_LEFT"/>
-		<DisplayFieldRef id="CLICKER_INTERVAL"/>
-		<DisplayFieldRef id="TREMORREST_FACE"/>
-		<DisplayFieldRef id="TREMORREST_RUE"/>
-		<DisplayFieldRef id="TREMORREST_LUE"/>
-		<DisplayFieldRef id="TREMORREST_RLE"/>
-		<DisplayFieldRef id="TREMORREST_LLE"/>
-		<DisplayFieldRef id="RIGIDITY_NECK"/>
-		<DisplayFieldRef id="RIGIDITY_RUE"/>
-		<DisplayFieldRef id="RIGIDITY_LUE"/>
-		<DisplayFieldRef id="RIGIDITY_RLE"/>
-		<DisplayFieldRef id="RIGIDITY_LLE"/>
-		<DisplayFieldRef id="HANDMOVEMENTSGRIP_RIGHT"/>
-		<DisplayFieldRef id="HANDMOVEMENTSGRIP_LEFT"/>
-		<DisplayFieldRef id="FACIALEXPRESSION"/>
-		<DisplayFieldRef id="GAIT"/>
-		<DisplayFieldRef id="SPEECH"/>
-		<DisplayFieldRef id="WRITING"/>
-		<DisplayFieldRef id="ARISEFROMCHAIR"/>
-		<DisplayFieldRef id="ACTIONPOSTURALTREMOR_RIGHT"/>
-		<DisplayFieldRef id="ACTIONPOSTURALTREMOR_LEFT"/>
-		<DisplayFieldRef id="HANDSRAM_RIGHT"/>
-		<DisplayFieldRef id="HANDSRAM_LEFT"/>
-		<DisplayFieldRef id="FINGERTAPS_RIGHT"/>
-		<DisplayFieldRef id="FINGERTAPS_LEFT"/>
-		<DisplayFieldRef id="POSTURE"/>
-		<DisplayFieldRef id="POSTURALSTABILITY"/>
-		<DisplayFieldRef id="FOOTTAPS_RIGHT"/>
-		<DisplayFieldRef id="FOOTTAPS_LEFT"/>
-		<DisplayFieldRef id="BODYBRADYKINESIAHYPOKINESIA"/>
-		<DisplayFieldRef id="PROBLEM"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="UPDRS3" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="INSCANNER"/>
-		<DisplayFieldRef id="CLICKER_RIGHT"/>
-		<DisplayFieldRef id="CLICKER_LEFT"/>
-		<DisplayFieldRef id="CLICKER_INTERVAL"/>
-		<DisplayFieldRef id="TREMORREST_FACE"/>
-		<DisplayFieldRef id="TREMORREST_RUE"/>
-		<DisplayFieldRef id="TREMORREST_LUE"/>
-		<DisplayFieldRef id="TREMORREST_RLE"/>
-		<DisplayFieldRef id="TREMORREST_LLE"/>
-		<DisplayFieldRef id="RIGIDITY_NECK"/>
-		<DisplayFieldRef id="RIGIDITY_RUE"/>
-		<DisplayFieldRef id="RIGIDITY_LUE"/>
-		<DisplayFieldRef id="RIGIDITY_RLE"/>
-		<DisplayFieldRef id="RIGIDITY_LLE"/>
-		<DisplayFieldRef id="HANDMOVEMENTSGRIP_RIGHT"/>
-		<DisplayFieldRef id="HANDMOVEMENTSGRIP_LEFT"/>
-		<DisplayFieldRef id="FACIALEXPRESSION"/>
-		<DisplayFieldRef id="GAIT"/>
-		<DisplayFieldRef id="SPEECH"/>
-		<DisplayFieldRef id="WRITING"/>
-		<DisplayFieldRef id="ARISEFROMCHAIR"/>
-		<DisplayFieldRef id="ACTIONPOSTURALTREMOR_RIGHT"/>
-		<DisplayFieldRef id="ACTIONPOSTURALTREMOR_LEFT"/>
-		<DisplayFieldRef id="HANDSRAM_RIGHT"/>
-		<DisplayFieldRef id="HANDSRAM_LEFT"/>
-		<DisplayFieldRef id="FINGERTAPS_RIGHT"/>
-		<DisplayFieldRef id="FINGERTAPS_LEFT"/>
-		<DisplayFieldRef id="POSTURE"/>
-		<DisplayFieldRef id="POSTURALSTABILITY"/>
-		<DisplayFieldRef id="FOOTTAPS_RIGHT"/>
-		<DisplayFieldRef id="FOOTTAPS_LEFT"/>
-		<DisplayFieldRef id="BODYBRADYKINESIAHYPOKINESIA"/>
-		<DisplayFieldRef id="PROBLEM"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="UPDRS3" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="XNAT_A_UPDRS3DATA_PROJECT_IDENTIFIER"/>
-		<DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-		<DisplayFieldRef id="INSCANNER"/>
-		<DisplayFieldRef id="CLICKER_RIGHT"/>
-		<DisplayFieldRef id="CLICKER_LEFT"/>
-		<DisplayFieldRef id="CLICKER_INTERVAL"/>
-		<DisplayFieldRef id="TREMORREST_FACE"/>
-		<DisplayFieldRef id="TREMORREST_RUE"/>
-		<DisplayFieldRef id="TREMORREST_LUE"/>
-		<DisplayFieldRef id="TREMORREST_RLE"/>
-		<DisplayFieldRef id="TREMORREST_LLE"/>
-		<DisplayFieldRef id="RIGIDITY_NECK"/>
-		<DisplayFieldRef id="RIGIDITY_RUE"/>
-		<DisplayFieldRef id="RIGIDITY_LUE"/>
-		<DisplayFieldRef id="RIGIDITY_RLE"/>
-		<DisplayFieldRef id="RIGIDITY_LLE"/>
-		<DisplayFieldRef id="HANDMOVEMENTSGRIP_RIGHT"/>
-		<DisplayFieldRef id="HANDMOVEMENTSGRIP_LEFT"/>
-		<DisplayFieldRef id="FACIALEXPRESSION"/>
-		<DisplayFieldRef id="GAIT"/>
-		<DisplayFieldRef id="SPEECH"/>
-		<DisplayFieldRef id="WRITING"/>
-		<DisplayFieldRef id="ARISEFROMCHAIR"/>
-		<DisplayFieldRef id="ACTIONPOSTURALTREMOR_RIGHT"/>
-		<DisplayFieldRef id="ACTIONPOSTURALTREMOR_LEFT"/>
-		<DisplayFieldRef id="HANDSRAM_RIGHT"/>
-		<DisplayFieldRef id="HANDSRAM_LEFT"/>
-		<DisplayFieldRef id="FINGERTAPS_RIGHT"/>
-		<DisplayFieldRef id="FINGERTAPS_LEFT"/>
-		<DisplayFieldRef id="POSTURE"/>
-		<DisplayFieldRef id="POSTURALSTABILITY"/>
-		<DisplayFieldRef id="FOOTTAPS_RIGHT"/>
-		<DisplayFieldRef id="FOOTTAPS_LEFT"/>
-		<DisplayFieldRef id="BODYBRADYKINESIAHYPOKINESIA"/>
-		<DisplayFieldRef id="PROBLEM"/>
-	</DisplayVersion>
-	<ViewLink alias="XNAT_A_UPDRS3DATA_PROJECTS">
-		<Mapping TableName="XNAT_A_UPDRS3DATA_PROJECTS">
-			<MappingColumn rootElement="xnat_a:updrs3Data" fieldElement="xnat_a:updrs3Data.ID" mapsTo="id"/>
-		</Mapping>
-	</ViewLink>
-	<SQLView name="XNAT_A_UPDRS3DATA_PROJECTS" sql="SELECT id, '&lt;' || expt.project || '&gt;' || xs_a_concat(',&lt;' || shared.project || '&gt;') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat_a:updrs3Data' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/assessments/display/xnat_a_ybocsData_display.xml b/src/main/webapp/schemas/assessments/display/xnat_a_ybocsData_display.xml
deleted file mode 100644
index e7747ab7..00000000
--- a/src/main/webapp/schemas/assessments/display/xnat_a_ybocsData_display.xml
+++ /dev/null
@@ -1,271 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat_a:ybocsData" full-description="YBOCS" brief-description="YBOCS">
-	<Arc name="PARTICIPANT_EXPERIMENT">
-		<CommonField id="PART_ID" local-field="SUBJECT_ID"/>
-		<CommonField id="DATE" local-field="DATE"/>
-		<CommonField id="EXPT_ID" local-field="EXPT_ID"/>
-	</Arc>
-	<DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:ybocsData.subject_ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
-				<InsertValue id="Field1" field="SUBJECT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:ybocsData.ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat_a:ybocsData','xnat_a:ybocsData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="RPT" header="ID" visible="true" image="true">
-		<Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat_a:ybocsData','xnat_a:ybocsData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="DATE" header="Date" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:ybocsData.date"/>
-	</DisplayField>
-	<DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
-	<DisplayFieldElement name="Field1" schema-element="xnat_a:ybocsData.date"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
-	<DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
-	<Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
-	</DisplayField>
-	<DisplayField header="Projects" id="PROJECTS" data-type="string">
-		<DisplayFieldElement name="Field1" viewName="XNAT_A_YBOCSDATA_PROJECTS" viewColumn="PROJECTS"/>
-	</DisplayField>
-	<DisplayField header="Label" id="LABEL" data-type="string">
-	<DisplayFieldElement name="Field1" schema-element="xnat_a:ybocsData.ID"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat_a:ybocsData.label"/>
-	<Content type="sql">COALESCE(@Field2, @Field1)</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat_a:ybocsData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat_a:ybocsData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat_a:ybocsData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat_a:ybocsData/search_field/xnat_a:ybocsData.ID">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat_a:ybocsData','xnat_a:ybocsData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="TITLE" value="Inserted: @Field1 (@Field2)">
-				<InsertValue id="Field1" field="INSERT_DATE"/>
-				<InsertValue id="Field2" field="INSERT_USER"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:ybocsData.project"/>
-	</DisplayField>
-	<DisplayField id="XNAT_A_YBOCSDATA_PROJECT_IDENTIFIER" header="XNAT_A_YBOCSDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">xnat_a_ybocsdata_project_id</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat_a:ybocsData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat_a:ybocsData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat_a:ybocsData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat_a:ybocsData/search_field/xnat_a:ybocsData.ID/project/@Field2">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-				<InsertValue id="Field2" field="@WHERE"/>
-			</Property>
-		</HTML-Link>
-		<SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_a_ybocsdata_project_id,sharing_share_xnat_experimentda_id FROM (	SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE'	UNION 	SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat_a:ybocsData.ID" queryField="sharing_share_xnat_experimentda_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:ybocsData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:ybocsData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayField id="XNAT_A_YBOCSDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">field</Content>
-		<SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat_a:ybocsData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat_a:ybocsData.ID" queryField="expt_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayField id="CURRENTORWORSTEVER" header="currentOrWorstEver" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:ybocsData/currentOrWorstEver"/>
-	</DisplayField>
-	<DisplayField id="TIMEOCCUPIEDWITHTHOUGHTS" header="timeOccupiedWithThoughts" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:ybocsData/timeOccupiedWithThoughts"/>
-	</DisplayField>
-	<DisplayField id="THOUGHTSINTERFEREFUNCTIONING" header="thoughtsInterfereFunctioning" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:ybocsData/thoughtsInterfereFunctioning"/>
-	</DisplayField>
-	<DisplayField id="DISTRESSCAUSED" header="distressCaused" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:ybocsData/distressCaused"/>
-	</DisplayField>
-	<DisplayField id="EFFORTTORESISTTHOUGHTS" header="effortToResistThoughts" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:ybocsData/effortToResistThoughts"/>
-	</DisplayField>
-	<DisplayField id="CONTROLOVERTHOUGHTS" header="controlOverThoughts" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:ybocsData/controlOverThoughts"/>
-	</DisplayField>
-	<DisplayField id="TIMEPERFORMING" header="timePerforming" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:ybocsData/timePerforming"/>
-	</DisplayField>
-	<DisplayField id="BEHAVIORSINTERFEREFUNCTIONING" header="behaviorsInterfereFunctioning" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:ybocsData/behaviorsInterfereFunctioning"/>
-	</DisplayField>
-	<DisplayField id="FEELINGIFPREVENTED" header="feelingIfPrevented" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:ybocsData/feelingIfPrevented"/>
-	</DisplayField>
-	<DisplayField id="EFFORTTORESISTBEHAVIORS" header="effortToResistBehaviors" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:ybocsData/effortToResistBehaviors"/>
-	</DisplayField>
-	<DisplayField id="BEHAVIORDRIVESTRENGTH" header="behaviorDriveStrength" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:ybocsData/behaviorDriveStrength"/>
-	</DisplayField>
-	<DisplayField id="UNTILJUSTRIGHT" header="untilJustRight" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:ybocsData/untilJustRight"/>
-	</DisplayField>
-	<DisplayField id="UNTILJUSTRIGHTAWARENESS" header="untilJustRightAwareness" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:ybocsData/untilJustRightAwareness"/>
-	</DisplayField>
-	<DisplayField id="UNTILJUSTRIGHTPERCEPTIONS" header="untilJustRightPerceptions" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:ybocsData/untilJustRightPerceptions"/>
-	</DisplayField>
-	<DisplayField id="WHENSTARTUNTILJUSTRIGHT" header="whenStartUntilJustRight" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:ybocsData/whenStartUntilJustRight"/>
-	</DisplayField>
-	<DisplayField id="FREQUENCYUNTILJUSTRIGHT" header="frequencyUntilJustRight" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:ybocsData/frequencyUntilJustRight"/>
-	</DisplayField>
-	<DisplayField id="FIRSTUNTILJUSTRIGHTAGE" header="firstUntilJustRightAge" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:ybocsData/firstUntilJustRightAge"/>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="YBOCS" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="RPT"/>
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="AGE"/>
-		<DisplayFieldRef id="CURRENTORWORSTEVER"/>
-		<DisplayFieldRef id="TIMEOCCUPIEDWITHTHOUGHTS"/>
-		<DisplayFieldRef id="THOUGHTSINTERFEREFUNCTIONING"/>
-		<DisplayFieldRef id="DISTRESSCAUSED"/>
-		<DisplayFieldRef id="EFFORTTORESISTTHOUGHTS"/>
-		<DisplayFieldRef id="CONTROLOVERTHOUGHTS"/>
-		<DisplayFieldRef id="TIMEPERFORMING"/>
-		<DisplayFieldRef id="BEHAVIORSINTERFEREFUNCTIONING"/>
-		<DisplayFieldRef id="FEELINGIFPREVENTED"/>
-		<DisplayFieldRef id="EFFORTTORESISTBEHAVIORS"/>
-		<DisplayFieldRef id="BEHAVIORDRIVESTRENGTH"/>
-		<DisplayFieldRef id="UNTILJUSTRIGHT"/>
-		<DisplayFieldRef id="UNTILJUSTRIGHTAWARENESS"/>
-		<DisplayFieldRef id="UNTILJUSTRIGHTPERCEPTIONS"/>
-		<DisplayFieldRef id="WHENSTARTUNTILJUSTRIGHT"/>
-		<DisplayFieldRef id="FREQUENCYUNTILJUSTRIGHT"/>
-		<DisplayFieldRef id="FIRSTUNTILJUSTRIGHTAGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="YBOCS" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-		<DisplayFieldRef id="CURRENTORWORSTEVER"/>
-		<DisplayFieldRef id="TIMEOCCUPIEDWITHTHOUGHTS"/>
-		<DisplayFieldRef id="THOUGHTSINTERFEREFUNCTIONING"/>
-		<DisplayFieldRef id="DISTRESSCAUSED"/>
-		<DisplayFieldRef id="EFFORTTORESISTTHOUGHTS"/>
-		<DisplayFieldRef id="CONTROLOVERTHOUGHTS"/>
-		<DisplayFieldRef id="TIMEPERFORMING"/>
-		<DisplayFieldRef id="BEHAVIORSINTERFEREFUNCTIONING"/>
-		<DisplayFieldRef id="FEELINGIFPREVENTED"/>
-		<DisplayFieldRef id="EFFORTTORESISTBEHAVIORS"/>
-		<DisplayFieldRef id="BEHAVIORDRIVESTRENGTH"/>
-		<DisplayFieldRef id="UNTILJUSTRIGHT"/>
-		<DisplayFieldRef id="UNTILJUSTRIGHTAWARENESS"/>
-		<DisplayFieldRef id="UNTILJUSTRIGHTPERCEPTIONS"/>
-		<DisplayFieldRef id="WHENSTARTUNTILJUSTRIGHT"/>
-		<DisplayFieldRef id="FREQUENCYUNTILJUSTRIGHT"/>
-		<DisplayFieldRef id="FIRSTUNTILJUSTRIGHTAGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="YBOCS" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="EXPT_ID"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-		<DisplayFieldRef id="CURRENTORWORSTEVER"/>
-		<DisplayFieldRef id="TIMEOCCUPIEDWITHTHOUGHTS"/>
-		<DisplayFieldRef id="THOUGHTSINTERFEREFUNCTIONING"/>
-		<DisplayFieldRef id="DISTRESSCAUSED"/>
-		<DisplayFieldRef id="EFFORTTORESISTTHOUGHTS"/>
-		<DisplayFieldRef id="CONTROLOVERTHOUGHTS"/>
-		<DisplayFieldRef id="TIMEPERFORMING"/>
-		<DisplayFieldRef id="BEHAVIORSINTERFEREFUNCTIONING"/>
-		<DisplayFieldRef id="FEELINGIFPREVENTED"/>
-		<DisplayFieldRef id="EFFORTTORESISTBEHAVIORS"/>
-		<DisplayFieldRef id="BEHAVIORDRIVESTRENGTH"/>
-		<DisplayFieldRef id="UNTILJUSTRIGHT"/>
-		<DisplayFieldRef id="UNTILJUSTRIGHTAWARENESS"/>
-		<DisplayFieldRef id="UNTILJUSTRIGHTPERCEPTIONS"/>
-		<DisplayFieldRef id="WHENSTARTUNTILJUSTRIGHT"/>
-		<DisplayFieldRef id="FREQUENCYUNTILJUSTRIGHT"/>
-		<DisplayFieldRef id="FIRSTUNTILJUSTRIGHTAGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="YBOCS" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="CURRENTORWORSTEVER"/>
-		<DisplayFieldRef id="TIMEOCCUPIEDWITHTHOUGHTS"/>
-		<DisplayFieldRef id="THOUGHTSINTERFEREFUNCTIONING"/>
-		<DisplayFieldRef id="DISTRESSCAUSED"/>
-		<DisplayFieldRef id="EFFORTTORESISTTHOUGHTS"/>
-		<DisplayFieldRef id="CONTROLOVERTHOUGHTS"/>
-		<DisplayFieldRef id="TIMEPERFORMING"/>
-		<DisplayFieldRef id="BEHAVIORSINTERFEREFUNCTIONING"/>
-		<DisplayFieldRef id="FEELINGIFPREVENTED"/>
-		<DisplayFieldRef id="EFFORTTORESISTBEHAVIORS"/>
-		<DisplayFieldRef id="BEHAVIORDRIVESTRENGTH"/>
-		<DisplayFieldRef id="UNTILJUSTRIGHT"/>
-		<DisplayFieldRef id="UNTILJUSTRIGHTAWARENESS"/>
-		<DisplayFieldRef id="UNTILJUSTRIGHTPERCEPTIONS"/>
-		<DisplayFieldRef id="WHENSTARTUNTILJUSTRIGHT"/>
-		<DisplayFieldRef id="FREQUENCYUNTILJUSTRIGHT"/>
-		<DisplayFieldRef id="FIRSTUNTILJUSTRIGHTAGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="YBOCS" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="XNAT_A_YBOCSDATA_PROJECT_IDENTIFIER"/>
-		<DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-		<DisplayFieldRef id="CURRENTORWORSTEVER"/>
-		<DisplayFieldRef id="TIMEOCCUPIEDWITHTHOUGHTS"/>
-		<DisplayFieldRef id="THOUGHTSINTERFEREFUNCTIONING"/>
-		<DisplayFieldRef id="DISTRESSCAUSED"/>
-		<DisplayFieldRef id="EFFORTTORESISTTHOUGHTS"/>
-		<DisplayFieldRef id="CONTROLOVERTHOUGHTS"/>
-		<DisplayFieldRef id="TIMEPERFORMING"/>
-		<DisplayFieldRef id="BEHAVIORSINTERFEREFUNCTIONING"/>
-		<DisplayFieldRef id="FEELINGIFPREVENTED"/>
-		<DisplayFieldRef id="EFFORTTORESISTBEHAVIORS"/>
-		<DisplayFieldRef id="BEHAVIORDRIVESTRENGTH"/>
-		<DisplayFieldRef id="UNTILJUSTRIGHT"/>
-		<DisplayFieldRef id="UNTILJUSTRIGHTAWARENESS"/>
-		<DisplayFieldRef id="UNTILJUSTRIGHTPERCEPTIONS"/>
-		<DisplayFieldRef id="WHENSTARTUNTILJUSTRIGHT"/>
-		<DisplayFieldRef id="FREQUENCYUNTILJUSTRIGHT"/>
-		<DisplayFieldRef id="FIRSTUNTILJUSTRIGHTAGE"/>
-	</DisplayVersion>
-	<ViewLink alias="XNAT_A_YBOCSDATA_PROJECTS">
-		<Mapping TableName="XNAT_A_YBOCSDATA_PROJECTS">
-			<MappingColumn rootElement="xnat_a:ybocsData" fieldElement="xnat_a:ybocsData.ID" mapsTo="id"/>
-		</Mapping>
-	</ViewLink>
-	<SQLView name="XNAT_A_YBOCSDATA_PROJECTS" sql="SELECT id, '&lt;' || expt.project || '&gt;' || xs_a_concat(',&lt;' || shared.project || '&gt;') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat_a:ybocsData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/assessments/display/xnat_a_ygtssData_display.xml b/src/main/webapp/schemas/assessments/display/xnat_a_ygtssData_display.xml
deleted file mode 100644
index b842197a..00000000
--- a/src/main/webapp/schemas/assessments/display/xnat_a_ygtssData_display.xml
+++ /dev/null
@@ -1,263 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat_a:ygtssData" full-description="YGTSS" brief-description="YGTSS">
-	<Arc name="PARTICIPANT_EXPERIMENT">
-		<CommonField id="PART_ID" local-field="SUBJECT_ID"/>
-		<CommonField id="DATE" local-field="DATE"/>
-		<CommonField id="EXPT_ID" local-field="EXPT_ID"/>
-	</Arc>
-	<DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:ygtssData.subject_ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
-				<InsertValue id="Field1" field="SUBJECT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:ygtssData.ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat_a:ygtssData','xnat_a:ygtssData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="RPT" header="ID" visible="true" image="true">
-		<Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat_a:ygtssData','xnat_a:ygtssData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="DATE" header="Date" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:ygtssData.date"/>
-	</DisplayField>
-	<DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
-	<DisplayFieldElement name="Field1" schema-element="xnat_a:ygtssData.date"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
-	<DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
-	<Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
-	</DisplayField>
-	<DisplayField header="Projects" id="PROJECTS" data-type="string">
-		<DisplayFieldElement name="Field1" viewName="XNAT_A_YGTSSDATA_PROJECTS" viewColumn="PROJECTS"/>
-	</DisplayField>
-	<DisplayField header="Label" id="LABEL" data-type="string">
-	<DisplayFieldElement name="Field1" schema-element="xnat_a:ygtssData.ID"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat_a:ygtssData.label"/>
-	<Content type="sql">COALESCE(@Field2, @Field1)</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat_a:ygtssData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat_a:ygtssData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat_a:ygtssData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat_a:ygtssData/search_field/xnat_a:ygtssData.ID">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat_a:ygtssData','xnat_a:ygtssData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="TITLE" value="Inserted: @Field1 (@Field2)">
-				<InsertValue id="Field1" field="INSERT_DATE"/>
-				<InsertValue id="Field2" field="INSERT_USER"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:ygtssData.project"/>
-	</DisplayField>
-	<DisplayField id="XNAT_A_YGTSSDATA_PROJECT_IDENTIFIER" header="XNAT_A_YGTSSDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">xnat_a_ygtssdata_project_id</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat_a:ygtssData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat_a:ygtssData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat_a:ygtssData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat_a:ygtssData/search_field/xnat_a:ygtssData.ID/project/@Field2">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-				<InsertValue id="Field2" field="@WHERE"/>
-			</Property>
-		</HTML-Link>
-		<SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_a_ygtssdata_project_id,sharing_share_xnat_experimentda_id FROM (	SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE'	UNION 	SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat_a:ygtssData.ID" queryField="sharing_share_xnat_experimentda_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:ygtssData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:ygtssData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayField id="XNAT_A_YGTSSDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">field</Content>
-		<SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat_a:ygtssData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat_a:ygtssData.ID" queryField="expt_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayField id="FILLEDOUTBY" header="filledOutBy" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:ygtssData/filledOutBy"/>
-	</DisplayField>
-	<DisplayField id="PERIOD" header="period" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:ygtssData/period"/>
-	</DisplayField>
-	<DisplayField id="WORSTEVERAGE" header="worstEverAge" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:ygtssData/worstEverAge"/>
-	</DisplayField>
-	<DisplayField id="MOTOR_NUMBER" header="number" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:ygtssData/motor/number"/>
-	</DisplayField>
-	<DisplayField id="MOTOR_FREQUENCY" header="frequency" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:ygtssData/motor/frequency"/>
-	</DisplayField>
-	<DisplayField id="MOTOR_INTENSITY" header="intensity" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:ygtssData/motor/intensity"/>
-	</DisplayField>
-	<DisplayField id="MOTOR_COMPLEXITY" header="complexity" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:ygtssData/motor/complexity"/>
-	</DisplayField>
-	<DisplayField id="MOTOR_INTERFERENCE" header="interference" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:ygtssData/motor/interference"/>
-	</DisplayField>
-	<DisplayField id="MOTOR_INVENTORY" header="inventory" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:ygtssData/motor/inventory"/>
-	</DisplayField>
-	<DisplayField id="PHONIC_NUMBER" header="number" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:ygtssData/phonic/number"/>
-	</DisplayField>
-	<DisplayField id="PHONIC_FREQUENCY" header="frequency" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:ygtssData/phonic/frequency"/>
-	</DisplayField>
-	<DisplayField id="PHONIC_INTENSITY" header="intensity" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:ygtssData/phonic/intensity"/>
-	</DisplayField>
-	<DisplayField id="PHONIC_COMPLEXITY" header="complexity" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:ygtssData/phonic/complexity"/>
-	</DisplayField>
-	<DisplayField id="PHONIC_INTERFERENCE" header="interference" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:ygtssData/phonic/interference"/>
-	</DisplayField>
-	<DisplayField id="PHONIC_INVENTORY" header="inventory" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:ygtssData/phonic/inventory"/>
-	</DisplayField>
-	<DisplayField id="IMPAIRMENT" header="impairment" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat_a:ygtssData/impairment"/>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="YGTSS" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="RPT"/>
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="AGE"/>
-		<DisplayFieldRef id="FILLEDOUTBY"/>
-		<DisplayFieldRef id="PERIOD"/>
-		<DisplayFieldRef id="WORSTEVERAGE"/>
-		<DisplayFieldRef id="MOTOR_NUMBER"/>
-		<DisplayFieldRef id="MOTOR_FREQUENCY"/>
-		<DisplayFieldRef id="MOTOR_INTENSITY"/>
-		<DisplayFieldRef id="MOTOR_COMPLEXITY"/>
-		<DisplayFieldRef id="MOTOR_INTERFERENCE"/>
-		<DisplayFieldRef id="MOTOR_INVENTORY"/>
-		<DisplayFieldRef id="PHONIC_NUMBER"/>
-		<DisplayFieldRef id="PHONIC_FREQUENCY"/>
-		<DisplayFieldRef id="PHONIC_INTENSITY"/>
-		<DisplayFieldRef id="PHONIC_COMPLEXITY"/>
-		<DisplayFieldRef id="PHONIC_INTERFERENCE"/>
-		<DisplayFieldRef id="PHONIC_INVENTORY"/>
-		<DisplayFieldRef id="IMPAIRMENT"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="YGTSS" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-		<DisplayFieldRef id="FILLEDOUTBY"/>
-		<DisplayFieldRef id="PERIOD"/>
-		<DisplayFieldRef id="WORSTEVERAGE"/>
-		<DisplayFieldRef id="MOTOR_NUMBER"/>
-		<DisplayFieldRef id="MOTOR_FREQUENCY"/>
-		<DisplayFieldRef id="MOTOR_INTENSITY"/>
-		<DisplayFieldRef id="MOTOR_COMPLEXITY"/>
-		<DisplayFieldRef id="MOTOR_INTERFERENCE"/>
-		<DisplayFieldRef id="MOTOR_INVENTORY"/>
-		<DisplayFieldRef id="PHONIC_NUMBER"/>
-		<DisplayFieldRef id="PHONIC_FREQUENCY"/>
-		<DisplayFieldRef id="PHONIC_INTENSITY"/>
-		<DisplayFieldRef id="PHONIC_COMPLEXITY"/>
-		<DisplayFieldRef id="PHONIC_INTERFERENCE"/>
-		<DisplayFieldRef id="PHONIC_INVENTORY"/>
-		<DisplayFieldRef id="IMPAIRMENT"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="YGTSS" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="EXPT_ID"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-		<DisplayFieldRef id="FILLEDOUTBY"/>
-		<DisplayFieldRef id="PERIOD"/>
-		<DisplayFieldRef id="WORSTEVERAGE"/>
-		<DisplayFieldRef id="MOTOR_NUMBER"/>
-		<DisplayFieldRef id="MOTOR_FREQUENCY"/>
-		<DisplayFieldRef id="MOTOR_INTENSITY"/>
-		<DisplayFieldRef id="MOTOR_COMPLEXITY"/>
-		<DisplayFieldRef id="MOTOR_INTERFERENCE"/>
-		<DisplayFieldRef id="MOTOR_INVENTORY"/>
-		<DisplayFieldRef id="PHONIC_NUMBER"/>
-		<DisplayFieldRef id="PHONIC_FREQUENCY"/>
-		<DisplayFieldRef id="PHONIC_INTENSITY"/>
-		<DisplayFieldRef id="PHONIC_COMPLEXITY"/>
-		<DisplayFieldRef id="PHONIC_INTERFERENCE"/>
-		<DisplayFieldRef id="PHONIC_INVENTORY"/>
-		<DisplayFieldRef id="IMPAIRMENT"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="YGTSS" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="FILLEDOUTBY"/>
-		<DisplayFieldRef id="PERIOD"/>
-		<DisplayFieldRef id="WORSTEVERAGE"/>
-		<DisplayFieldRef id="MOTOR_NUMBER"/>
-		<DisplayFieldRef id="MOTOR_FREQUENCY"/>
-		<DisplayFieldRef id="MOTOR_INTENSITY"/>
-		<DisplayFieldRef id="MOTOR_COMPLEXITY"/>
-		<DisplayFieldRef id="MOTOR_INTERFERENCE"/>
-		<DisplayFieldRef id="MOTOR_INVENTORY"/>
-		<DisplayFieldRef id="PHONIC_NUMBER"/>
-		<DisplayFieldRef id="PHONIC_FREQUENCY"/>
-		<DisplayFieldRef id="PHONIC_INTENSITY"/>
-		<DisplayFieldRef id="PHONIC_COMPLEXITY"/>
-		<DisplayFieldRef id="PHONIC_INTERFERENCE"/>
-		<DisplayFieldRef id="PHONIC_INVENTORY"/>
-		<DisplayFieldRef id="IMPAIRMENT"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="YGTSS" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="XNAT_A_YGTSSDATA_PROJECT_IDENTIFIER"/>
-		<DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-		<DisplayFieldRef id="FILLEDOUTBY"/>
-		<DisplayFieldRef id="PERIOD"/>
-		<DisplayFieldRef id="WORSTEVERAGE"/>
-		<DisplayFieldRef id="MOTOR_NUMBER"/>
-		<DisplayFieldRef id="MOTOR_FREQUENCY"/>
-		<DisplayFieldRef id="MOTOR_INTENSITY"/>
-		<DisplayFieldRef id="MOTOR_COMPLEXITY"/>
-		<DisplayFieldRef id="MOTOR_INTERFERENCE"/>
-		<DisplayFieldRef id="MOTOR_INVENTORY"/>
-		<DisplayFieldRef id="PHONIC_NUMBER"/>
-		<DisplayFieldRef id="PHONIC_FREQUENCY"/>
-		<DisplayFieldRef id="PHONIC_INTENSITY"/>
-		<DisplayFieldRef id="PHONIC_COMPLEXITY"/>
-		<DisplayFieldRef id="PHONIC_INTERFERENCE"/>
-		<DisplayFieldRef id="PHONIC_INVENTORY"/>
-		<DisplayFieldRef id="IMPAIRMENT"/>
-	</DisplayVersion>
-	<ViewLink alias="XNAT_A_YGTSSDATA_PROJECTS">
-		<Mapping TableName="XNAT_A_YGTSSDATA_PROJECTS">
-			<MappingColumn rootElement="xnat_a:ygtssData" fieldElement="xnat_a:ygtssData.ID" mapsTo="id"/>
-		</Mapping>
-	</ViewLink>
-	<SQLView name="XNAT_A_YGTSSDATA_PROJECTS" sql="SELECT id, '&lt;' || expt.project || '&gt;' || xs_a_concat(',&lt;' || shared.project || '&gt;') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat_a:ygtssData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/birn/birnprov.xsd b/src/main/webapp/schemas/birn/birnprov.xsd
deleted file mode 100644
index a5c82198..00000000
--- a/src/main/webapp/schemas/birn/birnprov.xsd
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v2004 rel. 3 U (http://www.xmlspy.com) by Mohana Ramaratnam (Washington University) -->
-<!-- edited with XMLSpy v2005 rel. 3 U (http://www.altova.com) by Dan Marcus (Washington University) -->
-<xs:schema targetNamespace="http://www.nbirn.net/prov" xmlns:xdat="http://nrg.wustl.edu/xdat" xmlns:prov="http://www.nbirn.net/prov" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<xs:element name="process" type="prov:process"/>
-	<xs:complexType name="process">
-		<xs:annotation>
-			<xs:appinfo>
-				<xdat:element ignoreWarnings="true"/>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="processStep" type="prov:processStep" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:appinfo>
-						<xdat:field>
-							<xdat:relation uniqueComposite="true"/>
-						</xdat:field>
-					</xs:appinfo>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="processStep">
-		<xs:annotation>
-			<xs:appinfo>
-				<xdat:element ignoreWarnings="true"/>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="program">
-				<xs:annotation>
-					<xs:appinfo>
-						<xdat:field uniqueComposite="true" size="5000"/>
-					</xs:appinfo>
-				</xs:annotation>
-				<xs:complexType>
-					<xs:simpleContent>
-						<xs:extension base="xs:string">
-							<xs:attribute name="version" type="xs:string"/>
-							<xs:attribute name="arguments" type="xs:string">
-								<xs:annotation>
-									<xs:appinfo>
-										<xdat:field size="5000"/>
-									</xs:appinfo>
-								</xs:annotation>
-							</xs:attribute>
-						</xs:extension>
-					</xs:simpleContent>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="timestamp" type="xs:dateTime">
-				<xs:annotation>
-					<xs:appinfo>
-						<xdat:field uniqueComposite="true"/>
-					</xs:appinfo>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="cvs" minOccurs="0">
-				<xs:simpleType>
-					<xs:restriction base="xs:string">
-						<xs:minLength value="0"></xs:minLength>
-						<xs:maxLength value="5000"></xs:maxLength>
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:element>
-			<xs:element name="user" type="xs:string">
-				<xs:annotation>
-					<xs:appinfo>
-						<xdat:field>
-							<xdat:sqlField name="user_name"/>
-						</xdat:field>
-					</xs:appinfo>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="machine" type="xs:string"/>
-			<xs:element name="platform">
-				<xs:complexType>
-					<xs:simpleContent>
-						<xs:extension base="xs:string">
-							<xs:attribute name="version" type="xs:string"/>
-						</xs:extension>
-					</xs:simpleContent>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="compiler" minOccurs="0">
-				<xs:complexType>
-					<xs:simpleContent>
-						<xs:extension base="xs:string">
-							<xs:attribute name="version" type="xs:string"/>
-						</xs:extension>
-					</xs:simpleContent>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="library" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:appinfo>
-						<xdat:element ignoreWarnings="true"/>
-					</xs:appinfo>
-				</xs:annotation>
-				<xs:complexType>
-					<xs:simpleContent>
-						<xs:extension base="xs:string">
-							<xs:attribute name="version" type="xs:string"/>
-						</xs:extension>
-					</xs:simpleContent>
-				</xs:complexType>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-</xs:schema>
diff --git a/src/main/webapp/schemas/catalog/catalog.xsd b/src/main/webapp/schemas/catalog/catalog.xsd
deleted file mode 100644
index f8ac8cb9..00000000
--- a/src/main/webapp/schemas/catalog/catalog.xsd
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v2004 rel. 3 U (http://www.xmlspy.com) by Tim Olsen (Washington University) -->
-<xs:schema targetNamespace="http://nrg.wustl.edu/catalog" xmlns:cat="http://nrg.wustl.edu/catalog" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<xs:element name="Catalog" type="cat:catalog"/>
-	<xs:element name="Entry" type="cat:entry"/>
-	<xs:element name="DCMCatalog" type="cat:dcmCatalog"/>
-	<xs:complexType name="catalog">
-		<xs:sequence minOccurs="0">
-			<xs:element name="metaFields" minOccurs="0">
-				<xs:complexType>
-					<xs:sequence minOccurs="0">
-						<xs:element name="metaField" minOccurs="0" maxOccurs="unbounded">
-							<xs:complexType>
-								<xs:simpleContent>
-									<xs:extension base="xs:string">
-										<xs:attribute name="name" type="xs:string"/>
-									</xs:extension>
-								</xs:simpleContent>
-							</xs:complexType>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="tags" minOccurs="0">
-				<xs:complexType>
-					<xs:sequence minOccurs="0">
-						<xs:element name="tag" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="sets" minOccurs="0">
-				<xs:complexType>
-					<xs:sequence minOccurs="0">
-						<xs:element name="entrySet" type="cat:catalog" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="entries" minOccurs="0">
-				<xs:complexType>
-					<xs:sequence minOccurs="0">
-						<xs:element name="entry" type="cat:entry" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-		</xs:sequence>
-		<xs:attribute name="ID" type="xs:string" use="optional"/>
-		<xs:attribute name="name" type="xs:string" use="optional"/>
-		<xs:attribute name="description" type="xs:string" use="optional"/>
-	</xs:complexType>
-	<xs:complexType name="entry">
-		<xs:sequence minOccurs="0">
-			<xs:element name="metaFields" minOccurs="0">
-				<xs:complexType>
-					<xs:sequence minOccurs="0">
-						<xs:element name="metaField" minOccurs="0" maxOccurs="unbounded">
-							<xs:complexType>
-								<xs:simpleContent>
-									<xs:extension base="xs:string">
-										<xs:attribute name="name" type="xs:string"/>
-									</xs:extension>
-								</xs:simpleContent>
-							</xs:complexType>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="tags" minOccurs="0">
-				<xs:complexType>
-					<xs:sequence minOccurs="0">
-						<xs:element name="tag" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-		</xs:sequence>
-		<xs:attribute name="URI" type="xs:anyURI" use="required"/>
-		<xs:attribute name="ID" type="xs:string" use="optional"/>
-		<xs:attribute name="name" type="xs:string" use="optional"/>
-		<xs:attribute name="description" type="xs:string" use="optional"/>
-		<xs:attribute name="format" type="xs:string" use="optional"/>
-		<xs:attribute name="content" type="xs:string" use="optional"/>
-		<xs:attribute name="cachePath" type="xs:string" use="optional"/>
-		<xs:attribute name="createdTime" type="xs:dateTime" use="optional"/>
-		<xs:attribute name="createdBy" type="xs:string" use="optional"/>
-		<xs:attribute name="createdEventId" type="xs:integer" use="optional"/>
-		<!-- BEGIN for use in audit trail -->
-		<xs:attribute name="modifiedTime" type="xs:dateTime" use="optional"/>
-		<xs:attribute name="modifiedBy" type="xs:string" use="optional"/>
-		<xs:attribute name="modifiedEventId" type="xs:integer" use="optional"/>
-		<!-- END for use in audit trail -->
-		<xs:attribute name="digest" type="xs:string" use="optional"/>
-	</xs:complexType>
-	<xs:complexType name="dcmEntry">
-		<xs:complexContent>
-			<xs:extension base="cat:entry">
-				<xs:attribute name="UID" type="xs:string" use="optional"/>
-				<xs:attribute name="instanceNumber" type="xs:integer" use="optional"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="dcmCatalog">
-		<xs:complexContent>
-			<xs:extension base="cat:catalog">
-				<xs:sequence minOccurs="0">
-					<xs:element name="dimensions" minOccurs="0">
-						<xs:complexType>
-							<xs:attribute name="x" type="xs:integer"/>
-							<xs:attribute name="y" type="xs:integer"/>
-							<xs:attribute name="z" type="xs:integer"/>
-							<xs:attribute name="volumes" type="xs:integer"/>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="voxelRes" minOccurs="0">
-						<xs:complexType>
-							<xs:attribute name="x" type="xs:float"/>
-							<xs:attribute name="y" type="xs:float"/>
-							<xs:attribute name="z" type="xs:float"/>
-							<xs:attribute name="units" type="xs:string"/>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="orientation" minOccurs="0">
-						<xs:simpleType>
-							<xs:restriction base="xs:string"/>
-						</xs:simpleType>
-					</xs:element>
-				</xs:sequence>
-				<xs:attribute name="UID" type="xs:string" use="optional"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-</xs:schema>
diff --git a/src/main/webapp/schemas/catalog/display/cat_catalog_display.xml b/src/main/webapp/schemas/catalog/display/cat_catalog_display.xml
deleted file mode 100644
index 6f12e65a..00000000
--- a/src/main/webapp/schemas/catalog/display/cat_catalog_display.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="cat:catalog" full-description="Catalog" brief-description="Catalog">
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="cat:catalog.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="cat:catalog.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayField id="ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="cat:catalog/ID"/>
-	</DisplayField>
-	<DisplayField id="NAME" header="name" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="cat:catalog/name"/>
-	</DisplayField>
-	<DisplayField id="DESCRIPTION" header="description" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="cat:catalog/description"/>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="ID" default-sort-order="DESC" brief-description="Catalog" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="NAME"/>
-		<DisplayFieldRef id="DESCRIPTION"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="ID" default-sort-order="DESC" brief-description="Catalog" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="NAME"/>
-		<DisplayFieldRef id="DESCRIPTION"/>
-	</DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/catalog/display/cat_dcmCatalog_display.xml b/src/main/webapp/schemas/catalog/display/cat_dcmCatalog_display.xml
deleted file mode 100644
index 9cee13c6..00000000
--- a/src/main/webapp/schemas/catalog/display/cat_dcmCatalog_display.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="cat:dcmCatalog" full-description="DCMCatalog" brief-description="DCMCatalog">
-	<DisplayField id="ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="cat:dcmCatalog/ID"/>
-	</DisplayField>
-	<DisplayField id="NAME" header="name" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="cat:dcmCatalog/name"/>
-	</DisplayField>
-	<DisplayField id="DESCRIPTION" header="description" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="cat:dcmCatalog/description"/>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="cat:dcmCatalog.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="cat:dcmCatalog.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayField id="DIMENSIONS_X" header="x" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="cat:dcmCatalog/dimensions/x"/>
-	</DisplayField>
-	<DisplayField id="DIMENSIONS_Y" header="y" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="cat:dcmCatalog/dimensions/y"/>
-	</DisplayField>
-	<DisplayField id="DIMENSIONS_Z" header="z" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="cat:dcmCatalog/dimensions/z"/>
-	</DisplayField>
-	<DisplayField id="DIMENSIONS_VOLUMES" header="volumes" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="cat:dcmCatalog/dimensions/volumes"/>
-	</DisplayField>
-	<DisplayField id="VOXELRES_X" header="x" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="cat:dcmCatalog/voxelRes/x"/>
-	</DisplayField>
-	<DisplayField id="VOXELRES_Y" header="y" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="cat:dcmCatalog/voxelRes/y"/>
-	</DisplayField>
-	<DisplayField id="VOXELRES_Z" header="z" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="cat:dcmCatalog/voxelRes/z"/>
-	</DisplayField>
-	<DisplayField id="VOXELRES_UNITS" header="units" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="cat:dcmCatalog/voxelRes/units"/>
-	</DisplayField>
-	<DisplayField id="ORIENTATION" header="orientation" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="cat:dcmCatalog/orientation"/>
-	</DisplayField>
-	<DisplayField id="UID" header="UID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="cat:dcmCatalog/UID"/>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="ID" default-sort-order="DESC" brief-description="DCMCatalog" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="NAME"/>
-		<DisplayFieldRef id="DESCRIPTION"/>
-		<DisplayFieldRef id="DIMENSIONS_X"/>
-		<DisplayFieldRef id="DIMENSIONS_Y"/>
-		<DisplayFieldRef id="DIMENSIONS_Z"/>
-		<DisplayFieldRef id="DIMENSIONS_VOLUMES"/>
-		<DisplayFieldRef id="VOXELRES_X"/>
-		<DisplayFieldRef id="VOXELRES_Y"/>
-		<DisplayFieldRef id="VOXELRES_Z"/>
-		<DisplayFieldRef id="VOXELRES_UNITS"/>
-		<DisplayFieldRef id="ORIENTATION"/>
-		<DisplayFieldRef id="UID"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="ID" default-sort-order="DESC" brief-description="DCMCatalog" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="NAME"/>
-		<DisplayFieldRef id="DESCRIPTION"/>
-		<DisplayFieldRef id="DIMENSIONS_X"/>
-		<DisplayFieldRef id="DIMENSIONS_Y"/>
-		<DisplayFieldRef id="DIMENSIONS_Z"/>
-		<DisplayFieldRef id="DIMENSIONS_VOLUMES"/>
-		<DisplayFieldRef id="VOXELRES_X"/>
-		<DisplayFieldRef id="VOXELRES_Y"/>
-		<DisplayFieldRef id="VOXELRES_Z"/>
-		<DisplayFieldRef id="VOXELRES_UNITS"/>
-		<DisplayFieldRef id="ORIENTATION"/>
-		<DisplayFieldRef id="UID"/>
-	</DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/catalog/display/cat_entry_display.xml b/src/main/webapp/schemas/catalog/display/cat_entry_display.xml
deleted file mode 100644
index 8aa79cf9..00000000
--- a/src/main/webapp/schemas/catalog/display/cat_entry_display.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="cat:entry" full-description="Entry" brief-description="Entry">
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="cat:entry.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="cat:entry.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayField id="URI" header="URI" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="cat:entry/URI"/>
-	</DisplayField>
-	<DisplayField id="ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="cat:entry/ID"/>
-	</DisplayField>
-	<DisplayField id="NAME" header="name" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="cat:entry/name"/>
-	</DisplayField>
-	<DisplayField id="DESCRIPTION" header="description" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="cat:entry/description"/>
-	</DisplayField>
-	<DisplayField id="FORMAT" header="format" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="cat:entry/format"/>
-	</DisplayField>
-	<DisplayField id="CONTENT" header="content" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="cat:entry/content"/>
-	</DisplayField>
-	<DisplayField id="CACHEPATH" header="cachePath" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="cat:entry/cachePath"/>
-	</DisplayField>
-	<DisplayField id="CREATEDTIME" header="createdTime" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="cat:entry/createdTime"/>
-	</DisplayField>
-	<DisplayField id="CREATEDBY" header="createdBy" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="cat:entry/createdBy"/>
-	</DisplayField>
-	<DisplayField id="CREATEDEVENTID" header="createdEventId" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="cat:entry/createdEventId"/>
-	</DisplayField>
-	<DisplayField id="MODIFIEDTIME" header="modifiedTime" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="cat:entry/modifiedTime"/>
-	</DisplayField>
-	<DisplayField id="MODIFIEDBY" header="modifiedBy" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="cat:entry/modifiedBy"/>
-	</DisplayField>
-	<DisplayField id="MODIFIEDEVENTID" header="modifiedEventId" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="cat:entry/modifiedEventId"/>
-	</DisplayField>
-	<DisplayField id="DIGEST" header="digest" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="cat:entry/digest"/>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="URI" default-sort-order="DESC" brief-description="Entry" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="URI"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="NAME"/>
-		<DisplayFieldRef id="DESCRIPTION"/>
-		<DisplayFieldRef id="FORMAT"/>
-		<DisplayFieldRef id="CONTENT"/>
-		<DisplayFieldRef id="CACHEPATH"/>
-		<DisplayFieldRef id="CREATEDTIME"/>
-		<DisplayFieldRef id="CREATEDBY"/>
-		<DisplayFieldRef id="CREATEDEVENTID"/>
-		<DisplayFieldRef id="MODIFIEDTIME"/>
-		<DisplayFieldRef id="MODIFIEDBY"/>
-		<DisplayFieldRef id="MODIFIEDEVENTID"/>
-		<DisplayFieldRef id="DIGEST"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="URI" default-sort-order="DESC" brief-description="Entry" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="URI"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="NAME"/>
-		<DisplayFieldRef id="DESCRIPTION"/>
-		<DisplayFieldRef id="FORMAT"/>
-		<DisplayFieldRef id="CONTENT"/>
-		<DisplayFieldRef id="CACHEPATH"/>
-		<DisplayFieldRef id="CREATEDTIME"/>
-		<DisplayFieldRef id="CREATEDBY"/>
-		<DisplayFieldRef id="CREATEDEVENTID"/>
-		<DisplayFieldRef id="MODIFIEDTIME"/>
-		<DisplayFieldRef id="MODIFIEDBY"/>
-		<DisplayFieldRef id="MODIFIEDEVENTID"/>
-		<DisplayFieldRef id="DIGEST"/>
-	</DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/ext/ext.xsd b/src/main/webapp/schemas/ext/ext.xsd
deleted file mode 100644
index 04a0c5a6..00000000
--- a/src/main/webapp/schemas/ext/ext.xsd
+++ /dev/null
@@ -1,333 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ D:/Development/XNAT/1.6/xnat_builder_1_6dev/plugin-resources/project-skeletons/xnat/src/schemas/ext/ext.xsd
-  ~ XNAT http://www.xnat.org
-  ~ Copyright (c) 2014, Washington University School of Medicine
-  ~ All Rights Reserved
-  ~
-  ~ Released under the Simplified BSD.
-  ~
-  ~ Last modified 2/7/14 12:19 PM
-  -->
-<xs:schema targetNamespace="http://nrg.wustl.edu/ext" xmlns:ext="http://nrg.wustl.edu/ext" xmlns:xdat="http://nrg.wustl.edu/xdat" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xnat="http://nrg.wustl.edu/xnat" elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<xs:import namespace="http://nrg.wustl.edu/xnat" schemaLocation="../xnat/xnat.xsd"/>
-	<xs:element name="AtlasScalingFactor" type="ext:atlasScalingFactorData"/>
-	<xs:element name="ClinicalAssessment" type="ext:clinicalAssessmentData"/>
-	<xs:element name="SegmentationFast" type="ext:segmentationFastData"/>
-	<xs:complexType name="atlasScalingFactorData">
-		<xs:complexContent>
-			<xs:extension base="xnat:mrAssessorData">
-				<xs:sequence>
-					<xs:element name="scalingFactor" type="xs:float"/>
-					<xs:element name="eta" type="xs:float"/>
-					<xs:element name="eICV" type="xs:float"/>
-					<xs:element name="baseScanNumber" type="xs:string"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="clinicalAssessmentData">
-		<xs:complexContent>
-			<xs:extension base="xnat:subjectAssessorData">
-				<xs:sequence>
-					<xs:element name="Diagnosis" minOccurs="0" maxOccurs="unbounded">
-						<xs:annotation>
-							<xs:documentation>DIAG1 - 5; DX1-5</xs:documentation>
-							<xs:appinfo>
-								<xdat:field uniqueComposite="UNIQUE_NAME_VALUE">
-									<xdat:relation uniqueComposite="UNIQUE_NAME_VALUE"/>
-								</xdat:field>
-							</xs:appinfo>
-						</xs:annotation>
-						<xs:complexType>
-							<xs:simpleContent>
-								<xs:extension base="xs:string">
-									<xs:attribute name="type" use="required">
-										<xs:simpleType>
-											<xs:restriction base="xs:string">
-												<xs:enumeration value="primary"/>
-												<xs:enumeration value="secondary"/>
-												<xs:enumeration value="tertiary"/>
-												<xs:enumeration value="additional"/>
-											</xs:restriction>
-										</xs:simpleType>
-									</xs:attribute>
-									<xs:attribute name="number" type="xs:integer" use="optional"/>
-								</xs:extension>
-							</xs:simpleContent>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="BloodPressure" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>SYSBP and DIASBP</xs:documentation>
-						</xs:annotation>
-						<xs:complexType>
-							<xs:attribute name="HighBP_CS_Bool" type="xs:boolean" use="optional"/>
-							<xs:attribute name="systolic" type="xs:integer" use="optional"/>
-							<xs:attribute name="diastolic" type="xs:integer" use="optional"/>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="Neuro" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="SBT" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>SBT; Katzman Short Blessed Test</xs:documentation>
-									</xs:annotation>
-									<xs:simpleType>
-										<xs:restriction base="xs:integer">
-											<xs:minInclusive value="0"/>
-											<xs:maxInclusive value="30"/>
-										</xs:restriction>
-									</xs:simpleType>
-								</xs:element>
-								<xs:element name="MMSE" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>MMSE; Mini Mental State Exam</xs:documentation>
-									</xs:annotation>
-									<xs:simpleType>
-										<xs:restriction base="xs:integer">
-											<xs:minInclusive value="0"/>
-											<xs:maxInclusive value="30"/>
-										</xs:restriction>
-									</xs:simpleType>
-								</xs:element>
-								<xs:element name="Bdsc" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>BDSC; Blessed Dementia Scale, Cognitive Portion</xs:documentation>
-									</xs:annotation>
-									<xs:simpleType>
-										<xs:restriction base="xs:float">
-											<xs:minInclusive value="0"/>
-											<xs:maxInclusive value="10"/>
-										</xs:restriction>
-									</xs:simpleType>
-								</xs:element>
-								<xs:element name="CDR" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>Clinical Dementia Rating</xs:documentation>
-									</xs:annotation>
-									<xs:complexType>
-										<xs:sequence>
-											<xs:element name="memory" minOccurs="0">
-												<xs:annotation>
-													<xs:documentation>INT110; CDR: memory</xs:documentation>
-												</xs:annotation>
-												<xs:simpleType>
-													<xs:restriction base="xs:float">
-														<xs:minInclusive value="0"/>
-														<xs:maxInclusive value="3"/>
-													</xs:restriction>
-												</xs:simpleType>
-											</xs:element>
-											<xs:element name="orientation" minOccurs="0">
-												<xs:annotation>
-													<xs:documentation>INT111; CDR: orientation</xs:documentation>
-												</xs:annotation>
-												<xs:simpleType>
-													<xs:restriction base="xs:float">
-														<xs:minInclusive value="0"/>
-														<xs:maxInclusive value="3"/>
-													</xs:restriction>
-												</xs:simpleType>
-											</xs:element>
-											<xs:element name="judgment_problem_solving" minOccurs="0">
-												<xs:annotation>
-													<xs:documentation>INT112; CDR: judgment and problem solving</xs:documentation>
-												</xs:annotation>
-												<xs:simpleType>
-													<xs:restriction base="xs:float">
-														<xs:minInclusive value="0"/>
-														<xs:maxInclusive value="3"/>
-													</xs:restriction>
-												</xs:simpleType>
-											</xs:element>
-											<xs:element name="community_affairs" minOccurs="0">
-												<xs:annotation>
-													<xs:documentation>INT113; CDR: community affairs</xs:documentation>
-												</xs:annotation>
-												<xs:simpleType>
-													<xs:restriction base="xs:float">
-														<xs:minInclusive value="0"/>
-														<xs:maxInclusive value="3"/>
-													</xs:restriction>
-												</xs:simpleType>
-											</xs:element>
-											<xs:element name="home_hobbies" minOccurs="0">
-												<xs:annotation>
-													<xs:documentation>INT114; CDR: home and hobbies</xs:documentation>
-												</xs:annotation>
-												<xs:simpleType>
-													<xs:restriction base="xs:float">
-														<xs:minInclusive value="0"/>
-														<xs:maxInclusive value="3"/>
-													</xs:restriction>
-												</xs:simpleType>
-											</xs:element>
-											<xs:element name="personal_care" minOccurs="0">
-												<xs:annotation>
-													<xs:documentation>INT115; CDR: personal care</xs:documentation>
-												</xs:annotation>
-												<xs:simpleType>
-													<xs:restriction base="xs:float">
-														<xs:minInclusive value="0"/>
-														<xs:maxInclusive value="3"/>
-													</xs:restriction>
-												</xs:simpleType>
-											</xs:element>
-										</xs:sequence>
-										<xs:attribute name="sumbox" use="optional">
-											<xs:annotation>
-												<xs:documentation>SUMBOX; Summary score of boxes in CDR</xs:documentation>
-											</xs:annotation>
-											<xs:simpleType>
-												<xs:restriction base="xs:float">
-													<xs:minInclusive value="0"/>
-													<xs:maxInclusive value="18"/>
-												</xs:restriction>
-											</xs:simpleType>
-										</xs:attribute>
-										<xs:attribute name="rating" type="xs:float" use="optional"/>
-									</xs:complexType>
-								</xs:element>
-								<xs:element name="ThinkingProblem_S_Bool" type="xs:boolean" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>INT501; thinking according to S</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="ThinkingProblem_CS_Bool" type="xs:boolean" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>INT324; thinking according to CS</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="ConsMemoryProblem_Bool" type="xs:boolean" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>INT415; Consistent memory problems</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="StrokeBool" type="xs:boolean" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>INT015; strokes or tias</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="Sx_Stroke_Bool" type="xs:boolean" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>SX_STROKE; stroke symptoms</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="Sx_Tia_Bool" type="xs:boolean" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>SX_TIA; tia symptoms</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="Movement" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="Spasticity_Bool" type="xs:boolean" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>INT121; spasticity</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="Rigid" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>RIGID; Cogwhell rigidity</xs:documentation>
-									</xs:annotation>
-									<xs:simpleType>
-										<xs:restriction base="xs:integer">
-											<xs:minInclusive value="0"/>
-											<xs:maxInclusive value="10"/>
-										</xs:restriction>
-									</xs:simpleType>
-								</xs:element>
-								<xs:element name="Bradyk_Bool" type="xs:boolean" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>BRADYK; bradykinesia</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="Gait" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>GAIT; extrapyramidal disorder</xs:documentation>
-									</xs:annotation>
-									<xs:simpleType>
-										<xs:restriction base="xs:integer">
-											<xs:minInclusive value="0"/>
-											<xs:maxInclusive value="5"/>
-										</xs:restriction>
-									</xs:simpleType>
-								</xs:element>
-								<xs:element name="AbnormalGait_Bool" type="xs:boolean" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>INT572; abnormal/normal concerning gait</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="Medication" minOccurs="0" maxOccurs="unbounded">
-						<xs:annotation>
-							<xs:documentation>INT601-604; INT615-INT617; INT624-626; INT632-633</xs:documentation>
-							<xs:appinfo>
-								<xdat:field>
-									<xdat:relation uniqueComposite="UNIQUE_NAME_VALUE"/>
-								</xdat:field>
-							</xs:appinfo>
-						</xs:annotation>
-						<xs:complexType>
-							<xs:attribute name="name" type="xs:string" use="optional">
-								<xs:annotation>
-									<xs:appinfo>
-										<xdat:field uniqueComposite="UNIQUE_NAME_VALUE"/>
-									</xs:appinfo>
-								</xs:annotation>
-							</xs:attribute>
-							<xs:attribute name="type" use="optional">
-								<xs:simpleType>
-									<xs:restriction base="xs:string">
-										<xs:enumeration value="cardiovascular"/>
-										<xs:enumeration value="bp-heart"/>
-										<xs:enumeration value="other"/>
-									</xs:restriction>
-								</xs:simpleType>
-							</xs:attribute>
-							<xs:attribute name="dose" type="xs:string" use="optional"/>
-							<xs:attribute name="history" type="xs:string" use="optional"/>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="Weight" type="xs:integer" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>WEIGHT; Body Weight (lbs.)</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Diabetes_Bool" type="xs:boolean" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>DIAB; Diabetes</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="HeartProblems_Bool" type="xs:boolean" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>HEART; heart problems</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="TobaccoUse_Bool" type="xs:boolean" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>TOBAC; tobacco use</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="segmentationFastData">
-		<xs:complexContent>
-			<xs:extension base="xnat:mrAssessorData">
-				<xs:sequence>
-					<xs:element name="brainVolume" type="xnat:volumetricRegion"/>
-				</xs:sequence>
-				<xs:attribute name="brainPercent" type="xs:float"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-</xs:schema>
diff --git a/src/main/webapp/schemas/pipeline/build.xsd b/src/main/webapp/schemas/pipeline/build.xsd
deleted file mode 100644
index d3aa3a77..00000000
--- a/src/main/webapp/schemas/pipeline/build.xsd
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v2004 rel. 3 U (http://www.xmlspy.com) by Mohana Ramaratnam (Washington University) -->
-<xs:schema targetNamespace="http://nrg.wustl.edu/build" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:build="http://nrg.wustl.edu/build" elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<xs:element name="Build" type="build:buildData">
-		<xs:annotation>
-			<xs:documentation>Comment describing your root element</xs:documentation>
-		</xs:annotation>
-	</xs:element>
-	<xs:complexType name="imageSessionData">
-		<xs:sequence>
-			<xs:element name="pipeline" maxOccurs="unbounded">
-				<xs:complexType>
-					<xs:complexContent>
-						<xs:extension base="build:pipelineData">
-							<xs:attribute name="stepId" type="xs:string" use="required"/>
-						</xs:extension>
-					</xs:complexContent>
-				</xs:complexType>
-			</xs:element>
-		</xs:sequence>
-		<xs:attribute name="type" type="xs:string" use="required"/>
-	</xs:complexType>
-	<xs:complexType name="pipelineParameterData">
-		<xs:sequence>
-			<xs:element name="parameter" maxOccurs="unbounded">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:choice minOccurs="0">
-							<xs:element name="schemaLink" type="xs:string"/>
-							<xs:element name="csvValues" type="xs:string"/>
-						</xs:choice>
-						<xs:element name="description" type="xs:string" minOccurs="0"/>
-					</xs:sequence>
-					<xs:attribute name="name" type="xs:string" use="required"/>
-					<xs:attribute name="multipleValues" type="xs:boolean" use="optional" default="true"/>
-					<xs:attribute name="editable" type="xs:boolean" use="optional" default="true"/>
-					<xs:attribute name="batchParam" type="xs:boolean" use="optional" default="false"/>
-				</xs:complexType>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="pipelineData">
-		<xs:sequence>
-			<xs:element name="displayText" type="xs:string">
-				<xs:annotation>
-					<xs:documentation>The text to be displayed on the web page for this pipeline. Used more like a title for the page</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="name" type="xs:string">
-				<xs:annotation>
-					<xs:documentation>Name of the pipeline</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="location" type="xs:string" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Path to pipeline descriptor</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="description" type="xs:string">
-				<xs:annotation>
-					<xs:documentation>Short description of the pipeline</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="parameters" type="build:pipelineParameterData" minOccurs="0"/>
-			<xs:element name="customwebpage" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Name of the custom page which will be used to display this pipeline step, if the auto generated page doesnt suit the user requirements</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="buildData">
-		<xs:sequence>
-			<xs:element name="project" type="build:imageSessionData" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-</xs:schema>
diff --git a/src/main/webapp/schemas/pipeline/display/workflowData_display.xml b/src/main/webapp/schemas/pipeline/display/workflowData_display.xml
deleted file mode 100644
index 11b88161..00000000
--- a/src/main/webapp/schemas/pipeline/display/workflowData_display.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ D:/Development/XNAT/1.6/xnat_builder_1_6dev/plugin-resources/project-skeletons/xnat/src/schemas/pipeline/display/workflowData_display.xml
-  ~ XNAT http://www.xnat.org
-  ~ Copyright (c) 2014, Washington University School of Medicine
-  ~ All Rights Reserved
-  ~
-  ~ Released under the Simplified BSD.
-  ~
-  ~ Last modified 2/7/14 12:19 PM
-  -->
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="wrk:workflowData" full-description="Workflow" brief-description="Workflow">
-	<DisplayField id="DATA_TYPE" header="data_type" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="wrk:workflowData/data_type"/>
-	</DisplayField>
-	<DisplayField id="WORKFLOW_ID" header="Workflow ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="wrk:workflowData/wrk_workflowdata_id"/>
-		<HTML-Link>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/wrk:workflowData/search_field/wrk:workflowData.wrk_workflowdata_id">
-				<InsertValue id="Field1" field="WORKFLOW_ID"/>
-			</Property>
-			<Property name="ONCLICK" value="return rpt('@Field1','wrk:workflowData','wrk:workflowData.wrk_workflowdata_id');">
-				<InsertValue id="Field1" field="WORKFLOW_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-    <DisplayField id="ID" header="ID" visible="true" searchable="true">
-        <DisplayFieldElement name="Field1" schema-element="wrk:workflowData/ID"/>
-    </DisplayField>
-    <DisplayField id="EXTERNALID" header="ExternalID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="wrk:workflowData/ExternalID"/>
-	</DisplayField>
-	<DisplayField id="CURRENT_STEP_LAUNCH_TIME" header="current_step_launch_time" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="wrk:workflowData/current_step_launch_time"/>
-	</DisplayField>
-	<DisplayField id="CURRENT_STEP_ID" header="current_step_id" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="wrk:workflowData/current_step_id"/>
-	</DisplayField>
-	<DisplayField id="STATUS" header="status" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="wrk:workflowData/status"/>
-		<Content type="sql">'&lt;B&gt;' || CASE @Field1 WHEN 'Complete' THEN '&lt;FONT COLOR=green&gt;Complete&lt;/FONT&gt;' WHEN 'In Progress' THEN '&lt;FONT COLOR=yellow&gt;In Progress&lt;/FONT&gt;' WHEN 'Running' THEN '&lt;FONT COLOR=yellow&gt;Running&lt;/FONT&gt;' WHEN 'Queued' THEN '&lt;FONT COLOR=orange&gt;Queued&lt;/FONT&gt;' WHEN 'Failed' THEN '&lt;FONT COLOR=red&gt;Failed&lt;/FONT&gt;' ELSE '&lt;FONT COLOR=orange&gt;' || @Field1 || '&lt;/FONT&gt;' END || '&lt;/B&gt;' </Content>
-		<HTML-Link>
-			<Property name="TITLE" value="@Field1">
-				<InsertValue id="Field1" field="CURRENT_STEP_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="PIPELINE_NAME" header="pipeline_name" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="wrk:workflowData/pipeline_name"/>
-	</DisplayField>
-	<DisplayField id="NEXT_STEP_ID" header="next_step_id" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="wrk:workflowData/next_step_id"/>
-	</DisplayField>
-	<DisplayField id="STEP_DESCRIPTION" header="step_description" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="wrk:workflowData/step_description"/>
-	</DisplayField>
-	<DisplayField id="LAUNCH_TIME" header="launch_time" visible="true" searchable="true" data-type="date">
-		<DisplayFieldElement name="Field1" schema-element="wrk:workflowData/launch_time"/>
-	</DisplayField>
-	<DisplayField id="PERCENTAGECOMPLETE" header="percentageComplete" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="wrk:workflowData/percentageComplete"/>
-	</DisplayField>
-    <DisplayField id="JOB_ID" header="Job ID" visible="true" searchable="true">
-        <DisplayFieldElement name="Field1" schema-element="wrk:workflowData/jobid"/>
-    </DisplayField>
-	<DisplayField id="LAST_MODIFIED" header="Modified" visible="true" searchable="true" data-type="date">
-		<DisplayFieldElement name="Field1" schema-element="wrk:workflowData/meta/insert_date"/>
-		<DisplayFieldElement name="Field2" schema-element="wrk:workflowData/meta/last_modified"/>
-		<Content type="sql">COALESCE(@Field2, @Field1)</Content>
-	</DisplayField>
-    <DisplayField id="SESSION_LABEL" header="Session" searchable="true" data-type="string">
-        <DisplayFieldElement name="Field1" viewName="SESSION_LABEL_VIEW" viewColumn="session_label"/>
-        <HTML-Link>
-            <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/@Field2/search_field/@Field2.ID">
-                <InsertValue id="Field1" field="ID"/>
-                <InsertValue id="Field2" field="DATA_TYPE"/>
-            </Property>
-            <Property name="ONCLICK" value="return rpt('@Field1','@Field2','@Field2.ID');">
-                <InsertValue id="Field1" field="ID"/>
-                <InsertValue id="Field2" field="DATA_TYPE"/>
-            </Property>
-        </HTML-Link>
-    </DisplayField>
-    <ViewLink alias="SESSION_LABEL_VIEW">
-        <Mapping TableName="SESSION_LABEL_VIEW">
-            <MappingColumn rootElement="wrk:workflowData" fieldElement="wrk:workflowData.wrk_workflowdata_id" mapsTo="workflow_id"/>
-        </Mapping>
-    </ViewLink>
-    <SQLView name="SESSION_LABEL_VIEW" sql="SELECT DISTINCT ex.label AS session_label, ex.project AS project, wf.wrk_workflowdata_id AS workflow_id FROM wrk_workflowData wf LEFT JOIN xnat_experimentData ex ON ex.id = wf.id"/>
-    <DisplayField id="PROJECT" header="Project" searchable="true" data-type="string">
-        <DisplayFieldElement name="Field1" viewName="SESSION_LABEL_VIEW" viewColumn="project"/>
-        <HTML-Link>
-            <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:projectData/search_field/xnat:projectData.ID">
-                <InsertValue id="Field1" field="PROJECT"/>
-            </Property>
-            <Property name="ONCLICK" value="return rpt('@Field1','xnat:projectData','xnat:projectData.ID');">
-                <InsertValue id="Field1" field="PROJECT"/>
-            </Property>
-        </HTML-Link>
-    </DisplayField>
-    <DisplayField id="SUBJECT_LABEL" header="Subject" searchable="true" data-type="string">
-        <DisplayFieldElement name="Field1" viewName="SUBJECT_LABEL_VIEW" viewColumn="subject_label"/>
-        <HTML-Link>
-            <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:subjectData/search_field/xnat:subjectData.ID">
-                <InsertValue id="Field1" field="ID"/>
-            </Property>
-            <Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
-                <InsertValue id="Field1" field="ID"/>
-            </Property>
-        </HTML-Link>
-    </DisplayField>
-    <ViewLink alias="SUBJECT_LABEL_VIEW">
-        <Mapping TableName="SUBJECT_LABEL_VIEW">
-            <MappingColumn rootElement="wrk:workflowData" fieldElement="wrk:workflowData.wrk_workflowdata_id" mapsTo="workflow_id"/>
-        </Mapping>
-    </ViewLink>
-    <SQLView name="SUBJECT_LABEL_VIEW" sql="SELECT DISTINCT sub.label AS subject_label, wf.wrk_workflowdata_id AS workflow_id FROM wrk_workflowData wf LEFT JOIN xnat_subjectData sub ON sub.id = wf.id"/>
-    <DisplayField id="USERFULLNAME" header="Userfullname" searchable="true" data-type="string">
-        <DisplayFieldElement name="Field1" viewName="USERFULLNAME_VIEW" viewColumn="userfullname"/>
-    </DisplayField>
-    <DisplayField id="USERLOGIN" header="Userlogin" searchable="true" data-type="string">
-        <DisplayFieldElement name="Field1" viewName="USERFULLNAME_VIEW" viewColumn="login"/>
-    </DisplayField>
-    <DisplayField id="USEREMAIL" header="Useremail" searchable="true" data-type="string">
-        <DisplayFieldElement name="Field1" viewName="USERFULLNAME_VIEW" viewColumn="email"/>
-    </DisplayField>
-    <ViewLink alias="USERFULLNAME_VIEW">
-        <Mapping TableName="USERFULLNAME_VIEW">
-            <MappingColumn rootElement="wrk:workflowData" fieldElement="wrk:workflowData.wrk_workflowdata_id" mapsTo="workflow_id"/>
-        </Mapping>
-    </ViewLink>
-    <SQLView name="USERFULLNAME_VIEW" sql="SELECT wrk.wrk_workflowdata_id AS workflow_id, u.login, u.firstname, u.lastname, u.firstname || ' ' ||  u.lastname AS userfullname, u.email FROM wrk_workflowData wrk LEFT JOIN wrk_workflowdata_meta_data meta ON wrk.workflowData_info=meta.meta_data_id LEFT JOIN xdat_user u ON meta.insert_user_xdat_user_id=u.xdat_user_id"/>
-    <DisplayVersion versionName="listing" default-order-by="LAST_MODIFIED" default-sort-order="DESC" brief-description="Workflow" dark-color="9999CC" light-color="CCCCFF">
-        <DisplayFieldRef id="WORKFLOW_ID"/>
-        <DisplayFieldRef id="PIPELINE_NAME"/>
-        <DisplayFieldRef id="LAUNCH_TIME"/>
-        <DisplayFieldRef id="STATUS"/>
-        <DisplayFieldRef id="CURRENT_STEP_ID"/>
-        <DisplayFieldRef id="JOB_ID"/>
-        <DisplayFieldRef id="USERFULLNAME"/>
-        <DisplayFieldRef id="SESSION_LABEL"/>
-    </DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/pipeline/repository.xsd b/src/main/webapp/schemas/pipeline/repository.xsd
deleted file mode 100644
index d3e32e43..00000000
--- a/src/main/webapp/schemas/pipeline/repository.xsd
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v2004 rel. 3 U (http://www.xmlspy.com) by Mohana Ramaratnam (Washington University) -->
-<xs:schema targetNamespace="http://nrg.wustl.edu/pipe" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:pipe="http://nrg.wustl.edu/pipe" elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<xs:element name="PipelineRepository">
-		<xs:annotation>
-			<xs:documentation>Comment describing your root element</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="pipeline" type="pipe:pipelineDetails" minOccurs="0" maxOccurs="unbounded">
-					<xs:annotation>
-						<xs:documentation>Path to the pipeline descriptor document</xs:documentation>
-					</xs:annotation>
-				</xs:element>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:complexType name="pipelineDetails">
-		<xs:sequence>
-			<xs:element name="path" type="xs:string">
-				<xs:annotation>
-					<xs:documentation>Complete path to the pipeline</xs:documentation>
-					<xs:appinfo>
-						<xdat:field>
-							<xdat:sqlField primaryKey="true"/>
-						</xdat:field>
-					</xs:appinfo>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="description" minOccurs="0">
-				<xs:simpleType>
-					<xs:restriction base="xs:string">
-						<xs:maxLength value="1500"/>
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:element>
-			<xs:element name="generatesElements" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>The XNAT datatypes that this pipeline generates</xs:documentation>
-				</xs:annotation>
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="element" type="xs:string" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="customwebpage" type="xs:string" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>The velocity template which is specific to this pipeline</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="parameters" minOccurs="0">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="parameter" maxOccurs="unbounded">
-							<xs:complexType>
-								<xs:sequence>
-									<xs:element name="name" type="xs:string"/>
-									<xs:element name="values">
-										<xs:complexType>
-											<xs:choice>
-												<xs:element name="schemaLink" type="xs:string"/>
-												<xs:element name="csvValues" type="xs:string"/>
-											</xs:choice>
-										</xs:complexType>
-									</xs:element>
-									<xs:element name="description" minOccurs="0">
-										<xs:simpleType>
-											<xs:restriction base="xs:string">
-												<xs:maxLength value="1500"/>
-											</xs:restriction>
-										</xs:simpleType>
-									</xs:element>
-								</xs:sequence>
-							</xs:complexType>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-		</xs:sequence>
-		<xs:attribute name="appliesTo" type="xs:string" use="required"/>
-	</xs:complexType>
-</xs:schema>
diff --git a/src/main/webapp/schemas/pipeline/workflow.xsd b/src/main/webapp/schemas/pipeline/workflow.xsd
deleted file mode 100644
index 3be2480b..00000000
--- a/src/main/webapp/schemas/pipeline/workflow.xsd
+++ /dev/null
@@ -1,209 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v2004 rel. 3 U (http://www.xmlspy.com) by Mohana Ramaratnam (Washington University) -->
-<xs:schema targetNamespace="http://nrg.wustl.edu/workflow" xmlns:xdat="http://nrg.wustl.edu/xdat" xmlns:wrk="http://nrg.wustl.edu/workflow" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<xs:complexType name="workflowData">
-		<xs:annotation>
-			<xs:appinfo>
-				<xdat:element storeHistory="false"/>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="executionEnvironment" type="wrk:abstractExecutionEnvironment" minOccurs="0"/>
-			<xs:element name="comments" minOccurs="0">
-				<xs:annotation>
-					<xs:appinfo>
-						<xdat:field size="10000"/>
-					</xs:appinfo>
-				</xs:annotation>
-				<xs:simpleType>
-					<xs:restriction base="xs:string">
-						<xs:maxLength value="10000"/>
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:element>
-			<xs:element name="details" minOccurs="0">
-				<xs:annotation>
-					<xs:appinfo>
-						<xdat:field size="10000"/>
-					</xs:appinfo>
-				</xs:annotation>
-				<xs:simpleType>
-					<xs:restriction base="xs:string">
-						<xs:maxLength value="10000"/>
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:element>
-			<xs:element name="justification" minOccurs="0">
-				<xs:annotation>
-					<xs:appinfo>
-						<xdat:field size="10000"/>
-					</xs:appinfo>
-				</xs:annotation>
-				<xs:simpleType>
-					<xs:restriction base="xs:string">
-						<xs:maxLength value="10000"/>
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:element>
-			<xs:element name="description" type="xs:string" minOccurs="0"/>
-		</xs:sequence>
-		<xs:attribute name="src" type="xs:string" use="optional"/>
-		<xs:attribute name="type" type="xs:string" use="optional"/>
-		<xs:attribute name="category" type="xs:string" use="optional"/>
-		<xs:attribute name="data_type" type="xs:string" use="required"/>
-		<xs:attribute name="ID" type="xs:string" use="required">
-			<xs:annotation>
-				<xs:appinfo>
-					<xdat:field uniqueComposite="true"/>
-				</xs:appinfo>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="ExternalID" type="xs:string" use="optional"/>
-		<xs:attribute name="current_step_launch_time" type="xs:dateTime" use="optional"/>
-		<xs:attribute name="current_step_id" type="xs:string" use="optional"/>
-		<xs:attribute name="status" type="xs:string" use="required"/>
-		<xs:attribute name="create_user" type="xs:string" use="optional"/>
-		<xs:attribute name="pipeline_name" type="xs:string" use="required">
-			<xs:annotation>
-				<xs:appinfo>
-					<xdat:field uniqueComposite="true"/>
-				</xs:appinfo>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="next_step_id" type="xs:string" use="optional"/>
-		<xs:attribute name="step_description" type="xs:string" use="optional"/>
-		<xs:attribute name="launch_time" type="xs:dateTime" use="required">
-			<xs:annotation>
-				<xs:appinfo>
-					<xdat:field uniqueComposite="true"/>
-				</xs:appinfo>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="percentageComplete" type="xs:string" use="optional"/>
-		<xs:attribute name="jobID" type="xs:string" use="optional"/>
-	</xs:complexType>
-	<xs:element name="Workflow" type="wrk:workflowData"/>
-	<xs:complexType name="abstractExecutionEnvironment"/>
-	<xs:complexType name="xnatExecutionEnvironment">
-		<xs:complexContent>
-			<xs:extension base="wrk:abstractExecutionEnvironment">
-				<xs:sequence>
-					<xs:element name="pipeline" type="xs:string">
-						<xs:annotation>
-							<xs:documentation>Path to the pipeline which is to be launched</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="xnatuser" type="xs:string">
-						<xs:annotation>
-							<xs:documentation>Xnat User who launched the pipeline</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="host" type="xs:string">
-						<xs:annotation>
-							<xs:documentation>Xnat host on which the pipeline was launched</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="startAt" type="xs:string" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Step id at which the pipeline was started</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="parameters" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Parameters which were passed to the pipeline</xs:documentation>
-						</xs:annotation>
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="parameter" maxOccurs="unbounded">
-									<xs:annotation>
-										<xs:appinfo>
-											<xdat:field size="1000">
-												<xdat:relation uniqueComposite="NAME"/>
-											</xdat:field>
-										</xs:appinfo>
-									</xs:annotation>
-									<xs:complexType>
-										<xs:simpleContent>
-											<xs:extension base="xs:string">
-												<xs:attribute name="name" type="xs:string" use="required">
-													<xs:annotation>
-														<xs:appinfo>
-															<xdat:field uniqueComposite="NAME"/>
-														</xs:appinfo>
-													</xs:annotation>
-												</xs:attribute>
-											</xs:extension>
-										</xs:simpleContent>
-									</xs:complexType>
-								</xs:element>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="notify" type="xs:string" minOccurs="0" maxOccurs="unbounded">
-						<xs:annotation>
-							<xs:documentation>Email ID to which notification is to be sent</xs:documentation>
-							<xs:appinfo>
-								<xdat:field uniqueComposite="NOTIFY">
-									<xdat:relation uniqueComposite="NOTIFY"/>
-								</xdat:field>
-							</xs:appinfo>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="dataType" type="xs:string">
-						<xs:annotation>
-							<xs:documentation>dataType as required by the workflow element</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="id" type="xs:string">
-						<xs:annotation>
-							<xs:documentation>is as required by the workflow element</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="supressNotification" type="xs:boolean">
-						<xs:annotation>
-							<xs:documentation>Boolean flag to suppress success notification in case custom emails are being sent</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="log" type="xs:string" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>path to log4j properties file</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="catalogPath" type="xs:string" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>root path to the catalog</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="parameterFile" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>The string content of this element is the xml as text</xs:documentation>
-						</xs:annotation>
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="xml" minOccurs="0">
-									<xs:annotation>
-										<xs:appinfo>
-											<xdat:field size="10000"/>
-										</xs:appinfo>
-									</xs:annotation>
-									<xs:simpleType>
-										<xs:restriction base="xs:string">
-											<xs:maxLength value="10000"/>
-										</xs:restriction>
-									</xs:simpleType>
-								</xs:element>
-							</xs:sequence>
-							<xs:attribute name="path" use="optional">
-								<xs:simpleType>
-									<xs:restriction base="xs:string">
-										<xs:maxLength value="1000"/>
-									</xs:restriction>
-								</xs:simpleType>
-							</xs:attribute>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-</xs:schema>
diff --git a/src/main/webapp/schemas/project/project.xsd b/src/main/webapp/schemas/project/project.xsd
deleted file mode 100644
index fc58f33e..00000000
--- a/src/main/webapp/schemas/project/project.xsd
+++ /dev/null
@@ -1,368 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v2004 rel. 3 U (http://www.xmlspy.com) by Tim Olsen (Washington University) -->
-<xs:schema targetNamespace="http://nrg.wustl.edu/arc" xmlns:arc="http://nrg.wustl.edu/arc" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xdat="http://nrg.wustl.edu/xdat" elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<xs:element name="ArchiveSpecification">
-		<xs:annotation>
-			<xs:documentation>Root Element</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="globalPaths" type="arc:pathInfo"/>
-				<xs:element name="fieldSpecifications" minOccurs="0">
-					<xs:complexType>
-						<xs:sequence minOccurs="0">
-							<xs:element name="fieldSpecification" type="arc:fieldSpecification" minOccurs="0" maxOccurs="unbounded">
-								<xs:annotation>
-									<xs:appinfo>
-										<xdat:field>
-											<xdat:relation uniqueComposite="SPEC_NAME"/>
-										</xdat:field>
-									</xs:appinfo>
-								</xs:annotation>
-							</xs:element>
-						</xs:sequence>
-					</xs:complexType>
-				</xs:element>
-				<xs:element name="projects" minOccurs="0">
-					<xs:complexType>
-						<xs:sequence minOccurs="0">
-							<xs:element name="project" type="arc:project" minOccurs="0" maxOccurs="unbounded">
-								<xs:unique name="projectId">
-									<xs:selector xpath=".//arc:project"/>
-									<xs:field xpath="@id"/>
-								</xs:unique>
-							</xs:element>
-						</xs:sequence>
-					</xs:complexType>
-				</xs:element>
-				<xs:element name="emailSpecifications" minOccurs="0">
-					<xs:complexType>
-						<xs:attribute name="new_user_registration" type="xs:boolean" default="true"/>
-						<xs:attribute name="pipeline" type="xs:boolean" default="true"/>
-						<xs:attribute name="project_access" type="xs:boolean" default="true"/>
-						<xs:attribute name="transfer" type="xs:boolean" default="true"/>
-						<xs:attribute name="page_email" type="xs:boolean" default="true"/>
-					</xs:complexType>
-				</xs:element>
-                <xs:element name="notification_types" minOccurs="0">
-                    <xs:complexType>
-                        <xs:sequence minOccurs="0">
-                            <xs:element name="notification_type" minOccurs="0" maxOccurs="unbounded">
-                                <xs:annotation>
-                                    <xs:appinfo>
-                                        <xdat:field uniqueComposite="VALUE">
-                                            <xdat:relation uniqueComposite="VALUE"/>
-                                        </xdat:field>
-                                    </xs:appinfo>
-                                </xs:annotation>
-                                <xs:complexType>
-                                    <xs:simpleContent>
-                                        <xs:extension base="xs:string">
-                                            <xs:attribute name="email_addresses" type="xs:string" use="optional"/>
-                                        </xs:extension>
-                                    </xs:simpleContent>
-                                </xs:complexType>
-                            </xs:element>
-                        </xs:sequence>
-                    </xs:complexType>
-                </xs:element>
-				<xs:element name="dcm" minOccurs="0">
-					<xs:complexType>
-						<xs:attribute name="dcm_host" type="xs:string" use="optional"/>
-						<xs:attribute name="dcm_port" type="xs:string" use="optional"/>
-						<xs:attribute name="dcm_ae" type="xs:string" use="optional"/>
-						<xs:attribute name="http_url" type="xs:string" use="optional"/>
-						<xs:attribute name="applet_link" type="xs:boolean" use="optional"/>
-					</xs:complexType>
-				</xs:element>
-			</xs:sequence>
-			<xs:attribute name="site_id" type="xs:string" use="required">
-				<xs:annotation>
-					<xs:appinfo>
-						<xdat:field unique="true"/>
-					</xs:appinfo>
-				</xs:annotation>
-			</xs:attribute>
-			<xs:attribute name="site_admin_email" type="xs:string" use="optional"/>
-			<xs:attribute name="site_url" type="xs:string" use="optional"/>
-			<xs:attribute name="smtp_host" type="xs:string" use="optional"/>
-			<xs:attribute name="require_login" type="xs:boolean" use="optional"/>
-			<xs:attribute name="enable_new_registrations" type="xs:boolean" use="optional"/>
-			<xs:attribute name="enable_csrf_token" type="xs:boolean" use="optional"/>
-			<xs:attribute name="quarantine_code" type="xs:integer" use="optional">
-				<xs:annotation>
-					<xs:documentation>Whether image data for this project should be placed in quarantine</xs:documentation>
-				</xs:annotation>
-			</xs:attribute>
-			<xs:attribute name="prearchive_code" type="xs:integer" use="optional">
-				<xs:annotation>
-					<xs:documentation>0: all data placed in prearchive (default); 1: sessions which match precreated project, subject, and session id are auto-archived; 2: sessions which match precreated project and subject will be auto-archived; 3: sessions which match precreated projects will be auto-archived; 4: all sessions will be auto-archived</xs:documentation>
-				</xs:annotation>
-			</xs:attribute>
-		</xs:complexType>
-	</xs:element>
-	<xs:complexType name="project">
-		<xs:annotation>
-			<xs:documentation>Describe specifications for a project identified by Attribute id</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="paths" type="arc:pathInfo" minOccurs="0"/>
-			<xs:element name="fieldSpecifications" minOccurs="0">
-				<xs:complexType>
-					<xs:sequence minOccurs="0">
-						<xs:element name="fieldSpecification" type="arc:fieldSpecification" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:appinfo>
-									<xdat:field>
-										<xdat:relation uniqueComposite="SPEC_NAME"/>
-									</xdat:field>
-								</xs:appinfo>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="properties" minOccurs="0">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="property" type="arc:property" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:appinfo>
-									<xdat:field>
-										<xdat:relation uniqueComposite="PROP_NAME"/>
-									</xdat:field>
-								</xs:appinfo>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="pipelines" minOccurs="0">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="descendants" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>Pipelines for the entities that descend from a project</xs:documentation>
-							</xs:annotation>
-							<xs:complexType>
-								<xs:sequence>
-									<xs:element name="descendant" maxOccurs="unbounded">
-										<xs:annotation>
-											<xs:appinfo>
-												<xdat:field>
-													<xdat:relation uniqueComposite="true" relationType="single"/>
-												</xdat:field>
-											</xs:appinfo>
-											<xs:documentation>Specify pipelines for each of the descendant from a project eg xnat:subjectData, xnat:mrSessionData, xnat:petSessionData, cnda:segmentationData etc</xs:documentation>
-										</xs:annotation>
-										<xs:complexType>
-											<xs:sequence>
-												<xs:element name="pipeline" maxOccurs="unbounded">
-													<xs:annotation>
-														<xs:appinfo>
-															<xdat:field>
-																<xdat:relation uniqueComposite="true" relationType="single"/>
-															</xdat:field>
-														</xs:appinfo>
-													</xs:annotation>
-													<xs:complexType>
-														<xs:complexContent>
-															<xs:extension base="arc:pipelineData">
-																<xs:attribute name="stepId" type="xs:string" use="required">
-																	<xs:annotation>
-																		<xs:appinfo>
-																			<xdat:field uniqueComposite="true"/>
-																		</xs:appinfo>
-																	</xs:annotation>
-																</xs:attribute>
-																<xs:attribute name="dependent" type="xs:boolean" use="optional" default="true"/>
-															</xs:extension>
-														</xs:complexContent>
-													</xs:complexType>
-												</xs:element>
-											</xs:sequence>
-											<xs:attribute name="xsiType" type="xs:string" use="required">
-												<xs:annotation>
-													<xs:appinfo>
-														<xdat:field uniqueComposite="true"/>
-													</xs:appinfo>
-												</xs:annotation>
-											</xs:attribute>
-										</xs:complexType>
-									</xs:element>
-								</xs:sequence>
-							</xs:complexType>
-						</xs:element>
-						<xs:element name="pipeline" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>Pipelines for the project</xs:documentation>
-							</xs:annotation>
-							<xs:complexType>
-								<xs:complexContent>
-									<xs:extension base="arc:pipelineData">
-										<xs:attribute name="stepId" type="xs:string" use="required"/>
-										<xs:attribute name="dependent" type="xs:boolean" use="optional" default="true">
-											<xs:annotation>
-												<xs:documentation>Specify true if this pipeline is launchable only when all the previous pipelines have completed succesfully. Set this value to false if this pipeline can be run independent of others. </xs:documentation>
-											</xs:annotation>
-										</xs:attribute>
-									</xs:extension>
-								</xs:complexContent>
-							</xs:complexType>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-				<xs:unique name="pipelineId">
-					<xs:selector xpath=".//arc:pipeline"/>
-					<xs:field xpath="@stepId"/>
-				</xs:unique>
-			</xs:element>
-		</xs:sequence>
-		<xs:attribute name="id" type="xs:string" use="required">
-			<xs:annotation>
-				<xs:appinfo>
-					<xdat:field unique="true"/>
-				</xs:appinfo>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="current_arc" type="xs:string" use="optional"/>
-		<xs:attribute name="quarantine_code" type="xs:integer" use="optional">
-			<xs:annotation>
-				<xs:documentation>Whether image data for this project should be placed in quarantine</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="prearchive_code" type="xs:integer" use="optional">
-			<xs:annotation>
-				<xs:documentation>0: all data placed in prearchive (default); 1: sessions which match precreated project, subject, and session id are auto-archived; 2: sessions which match precreated project and subject will be auto-archived; 3: sessions which match precreated projects will be auto-archived; 4: all sessions will be auto-archived; 5: all sessions will be auto-archived and overwrite existing files</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-	</xs:complexType>
-	<xs:complexType name="pipelineData">
-		<xs:annotation>
-			<xs:appinfo>
-				<xdat:element ignoreWarnings="true" matchByValues="true"/>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="displayText" type="xs:string">
-				<xs:annotation>
-					<xs:documentation>The text to be displayed on the web page for this pipeline. Used more like a title for the page</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="name" type="xs:string">
-				<xs:annotation>
-					<xs:documentation>Name of the pipeline</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="location" type="xs:string" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Path to pipeline descriptor</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="description" type="xs:string">
-				<xs:annotation>
-					<xs:documentation>Short description of the pipeline</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="parameters" minOccurs="0">
-				<xs:complexType>
-					<xs:sequence minOccurs="0">
-						<xs:element name="parameter" type="arc:pipelineParameterData" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:appinfo>
-									<xdat:field>
-										<xdat:relation uniqueComposite="PARAM_NAME"/>
-									</xdat:field>
-								</xs:appinfo>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="customwebpage" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Name of the custom page which will be used to display this pipeline step, if the auto generated page doesnt suit the user requirements</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="pipelineParameterData">
-		<xs:sequence>
-			<xs:choice minOccurs="0">
-				<xs:element name="schemaLink" type="xs:string"/>
-				<xs:element name="csvValues">
-					<xs:complexType>
-						<xs:simpleContent>
-							<xs:extension base="xs:string">
-								<xs:attribute name="selected" type="xs:string" use="optional"/>
-							</xs:extension>
-						</xs:simpleContent>
-					</xs:complexType>
-				</xs:element>
-			</xs:choice>
-			<xs:element name="description" minOccurs="0">
-				<xs:simpleType>
-					<xs:restriction base="xs:string">
-						<xs:maxLength value="1500"/>
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:element>
-		</xs:sequence>
-		<xs:attribute name="name" type="xs:string" use="required">
-			<xs:annotation>
-				<xs:appinfo>
-					<xdat:field uniqueComposite="PARAM_NAME"/>
-				</xs:appinfo>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="multipleValues" type="xs:boolean" use="optional" default="true"/>
-		<xs:attribute name="editable" type="xs:boolean" use="optional" default="true"/>
-		<xs:attribute name="batchParam" type="xs:boolean" use="optional" default="false"/>
-	</xs:complexType>
-	<xs:complexType name="pathInfo">
-		<xs:sequence>
-			<xs:element name="archivePath" type="xs:string" minOccurs="0"/>
-			<xs:element name="prearchivePath" type="xs:string" minOccurs="0"/>
-			<xs:element name="cachePath" type="xs:string" minOccurs="0"/>
-			<xs:element name="buildPath" type="xs:string" minOccurs="0"/>
-			<xs:element name="ftpPath" type="xs:string" minOccurs="0"/>
-			<xs:element name="pipelinePath" type="xs:string" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="property">
-		<xs:annotation>
-			<xs:appinfo>
-				<xdat:field size="10000"/>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:simpleContent>
-			<xs:extension base="xs:string">
-				<xs:attribute name="name" type="xs:string">
-					<xs:annotation>
-						<xs:appinfo>
-							<xdat:field uniqueComposite="PROP_NAME" size="10000"/>
-						</xs:appinfo>
-					</xs:annotation>
-				</xs:attribute>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<xs:complexType name="fieldSpecification">
-		<xs:annotation>
-			<xs:appinfo>
-				<xdat:field size="10000"/>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:simpleContent>
-			<xs:extension base="xs:string">
-				<xs:attribute name="name" type="xs:string">
-					<xs:annotation>
-						<xs:appinfo>
-							<xdat:field uniqueComposite="SPEC_NAME" size="10000"/>
-						</xs:appinfo>
-					</xs:annotation>
-				</xs:attribute>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-</xs:schema>
diff --git a/src/main/webapp/schemas/screening/display/scr_screeningAssessment_display.xml b/src/main/webapp/schemas/screening/display/scr_screeningAssessment_display.xml
deleted file mode 100644
index 4494ea75..00000000
--- a/src/main/webapp/schemas/screening/display/scr_screeningAssessment_display.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="scr:screeningAssessment" full-description="ScreeningAssessment" brief-description="ScreeningAssessment">
-	<DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="scr:screeningAssessment.ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','scr:screeningAssessment','scr:screeningAssessment.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="RPT" header="ID" visible="true" image="true">
-		<Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','scr:screeningAssessment','scr:screeningAssessment.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="DATE" header="Date" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="scr:screeningAssessment.date"/>
-	</DisplayField>
-	<DisplayField header="Projects" id="PROJECTS" data-type="string">
-		<DisplayFieldElement name="Field1" viewName="SCR_SCREENINGASSESSMENT_PROJECTS" viewColumn="PROJECTS"/>
-	</DisplayField>
-	<DisplayField header="Label" id="LABEL" data-type="string">
-	<DisplayFieldElement name="Field1" schema-element="scr:screeningAssessment.ID"/>
-	<DisplayFieldElement name="Field2" schema-element="scr:screeningAssessment.label"/>
-	<Content type="sql">COALESCE(@Field2, @Field1)</Content>
-		<HTML-Link>
-			<SecureLink elementName="scr:screeningAssessment">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="scr:screeningAssessment/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="scr:screeningAssessment/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/scr:screeningAssessment/search_field/scr:screeningAssessment.ID">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="ONCLICK" value="return rpt('@Field1','scr:screeningAssessment','scr:screeningAssessment.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="TITLE" value="Inserted: @Field1 (@Field2)">
-				<InsertValue id="Field1" field="INSERT_DATE"/>
-				<InsertValue id="Field2" field="INSERT_USER"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="scr:screeningAssessment.project"/>
-	</DisplayField>
-	<DisplayField id="SCR_SCREENINGASSESSMENT_PROJECT_IDENTIFIER" header="SCR_SCREENINGASSESSMENT ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">scr_screeningassessment_project_id</Content>
-		<HTML-Link>
-			<SecureLink elementName="scr:screeningAssessment">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="scr:screeningAssessment/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="scr:screeningAssessment/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/scr:screeningAssessment/search_field/scr:screeningAssessment.ID/project/@Field2">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-				<InsertValue id="Field2" field="@WHERE"/>
-			</Property>
-		</HTML-Link>
-		<SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS scr_screeningassessment_project_id,sharing_share_xnat_experimentda_id FROM (	SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE'	UNION 	SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="scr:screeningAssessment.ID" queryField="sharing_share_xnat_experimentda_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="scr:screeningAssessment.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="scr:screeningAssessment.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayField id="SCR_SCREENINGASSESSMENT_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">field</Content>
-		<SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='scr:screeningAssessment') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="scr:screeningAssessment.ID" queryField="expt_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayField id="RATER" header="rater" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="scr:screeningAssessment/rater"/>
-	</DisplayField>
-	<DisplayField id="COMMENTS" header="comments" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="scr:screeningAssessment/comments"/>
-	</DisplayField>
-	<DisplayField id="PASS" header="pass" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="scr:screeningAssessment/pass"/>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="ScreeningAssessment" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="RPT"/>
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="RATER"/>
-		<DisplayFieldRef id="COMMENTS"/>
-		<DisplayFieldRef id="PASS"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="ScreeningAssessment" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="RATER"/>
-		<DisplayFieldRef id="COMMENTS"/>
-		<DisplayFieldRef id="PASS"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="ScreeningAssessment" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="EXPT_ID"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="RATER"/>
-		<DisplayFieldRef id="COMMENTS"/>
-		<DisplayFieldRef id="PASS"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="ScreeningAssessment" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="EXPT_ID"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="RATER"/>
-		<DisplayFieldRef id="COMMENTS"/>
-		<DisplayFieldRef id="PASS"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="ScreeningAssessment" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="SCR_SCREENINGASSESSMENT_PROJECT_IDENTIFIER"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="RATER"/>
-		<DisplayFieldRef id="COMMENTS"/>
-		<DisplayFieldRef id="PASS"/>
-	</DisplayVersion>
-	<ViewLink alias="SCR_SCREENINGASSESSMENT_PROJECTS">
-		<Mapping TableName="SCR_SCREENINGASSESSMENT_PROJECTS">
-			<MappingColumn rootElement="scr:screeningAssessment" fieldElement="scr:screeningAssessment.ID" mapsTo="id"/>
-		</Mapping>
-	</ViewLink>
-	<SQLView name="SCR_SCREENINGASSESSMENT_PROJECTS" sql="SELECT id, '&lt;' || expt.project || '&gt;' || xs_a_concat(',&lt;' || shared.project || '&gt;') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='scr:screeningAssessment' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/screening/screeningAssessment.xsd b/src/main/webapp/schemas/screening/screeningAssessment.xsd
deleted file mode 100644
index fe4fa807..00000000
--- a/src/main/webapp/schemas/screening/screeningAssessment.xsd
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSpy v2010 rel. 3 sp1 (http://www.altova.com) by Mohana Ramaratnam (NRG INDIA) -->
-<!-- edited with XMLSPY v2004 rel. 3 U (http://www.xmlspy.com) by Mohana Ramaratnam (Washington University) -->
-<xs:schema targetNamespace="http://nrg.wustl.edu/scr" xmlns:xdat="http://nrg.wustl.edu/xdat" xmlns:scr="http://nrg.wustl.edu/scr" xmlns:xnat="http://nrg.wustl.edu/xnat" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<xs:import namespace="http://nrg.wustl.edu/xnat" schemaLocation="../xnat/xnat.xsd"/>
-	<xs:complexType name="screeningAssessment">
-		<xs:complexContent>
-			<xs:extension base="xnat:imageAssessorData">
-				<xs:sequence>
-					<xs:element name="rater" type="xs:string" minOccurs="0"/>
-					<xs:element name="comments" minOccurs="0">
-						<xs:simpleType>
-							<xs:restriction base="xs:string">
-								<xs:maxLength value="1000"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element name="pass" type="xs:string" minOccurs="0"/>
-					<xs:element name="scans" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="scan" type="scr:screeningScanData" maxOccurs="unbounded">
-									<xs:annotation>
-										<xs:appinfo>
-											<xdat:field>
-												<xdat:relation uniqueComposite="scr_scan_id_fk" relationType="single"/>
-											</xdat:field>
-										</xs:appinfo>
-									</xs:annotation>
-								</xs:element>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="screeningScanData">
-		<xs:sequence>
-			<xs:element name="imageScan_ID" type="xs:string">
-				<xs:annotation>
-					<xs:appinfo>
-						<xdat:field uniqueComposite="scr_scan_id_fk"/>
-					</xs:appinfo>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="comments" minOccurs="0">
-				<xs:simpleType>
-					<xs:restriction base="xs:string">
-						<xs:maxLength value="1000"/>
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:element>
-			<xs:element name="pass" type="xs:string" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="ScreeningAssessment" type="scr:screeningAssessment"/>
-</xs:schema>
diff --git a/src/main/webapp/schemas/search/search.xsd b/src/main/webapp/schemas/search/search.xsd
deleted file mode 100644
index 69e2afe3..00000000
--- a/src/main/webapp/schemas/search/search.xsd
+++ /dev/null
@@ -1,178 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v2004 rel. 3 U (http://www.xmlspy.com) by Tim Olsen (Washington University) -->
-<xs:schema targetNamespace="http://nrg.wustl.edu/search" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:search="http://nrg.wustl.edu/search" elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<xs:element name="Search" type="search:search"/>
-	<xs:complexType name="search">
-		<xs:sequence>
-			<xs:element name="root_element_name">
-				<xs:complexType>
-					<xs:simpleContent>
-						<xs:extension base="xs:string"/>
-					</xs:simpleContent>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="joined_elements" minOccurs="0">
-				<xs:complexType>
-					<xs:sequence minOccurs="0">
-						<xs:element name="joined_element" minOccurs="0" maxOccurs="unbounded">
-							<xs:complexType>
-								<xs:complexContent>
-									<xs:extension base="search:joinType"/>
-								</xs:complexContent>
-							</xs:complexType>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="fields" minOccurs="0">
-				<xs:complexType>
-					<xs:sequence minOccurs="0">
-						<xs:element name="field" type="search:fieldType" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:appinfo>
-									<xdat:field>
-										<xdat:relation relationType="single" uniqueComposite="true"/>
-									</xdat:field>
-								</xs:appinfo>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="search_where" type="search:criteria_set" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:appinfo>
-						<xdat:field>
-							<xdat:relation relationType="single"/>
-						</xdat:field>
-					</xs:appinfo>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="sort_by" minOccurs="0">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="element_name" type="xs:string" minOccurs="0"/>
-						<xs:element name="field_ID" type="xs:string" minOccurs="0"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-		</xs:sequence>
-		<xs:attribute name="ID" type="xs:string">
-			<xs:annotation>
-				<xs:appinfo>
-					<xdat:field>
-						<xdat:sqlField primaryKey="true"/>
-					</xdat:field>
-				</xs:appinfo>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="description" type="xs:string"/>
-		<xs:attribute name="allow-diff-columns" type="xs:boolean" use="optional" default="true"/>
-		<xs:attribute name="brief-description" type="xs:string"/>
-		<xs:attribute name="tag" type="xs:string" use="optional"/>
-		<xs:attribute name="return_type" type="xs:string" use="optional"/>
-		<xs:attribute name="paging" type="xs:boolean" use="optional"/>
-		<xs:attribute name="page_size" type="xs:integer" use="optional"/>
-		<xs:attribute name="page_num" type="xs:integer" use="optional"/>
-	</xs:complexType>
-	<xs:complexType name="criteria_set">
-		<xs:annotation>
-			<xs:appinfo>
-				<xdat:element ignoreWarnings="true"/>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="criteria" type="search:criteria" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:appinfo>
-						<xdat:field>
-							<xdat:relation relationType="single"/>
-						</xdat:field>
-					</xs:appinfo>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="child_set" type="search:criteria_set" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:appinfo>
-						<xdat:field>
-							<xdat:relation relationType="single"/>
-						</xdat:field>
-					</xs:appinfo>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-		<xs:attribute name="method" use="required">
-			<xs:simpleType>
-				<xs:restriction base="xs:string">
-					<xs:enumeration value="AND"/>
-					<xs:enumeration value="OR"/>
-				</xs:restriction>
-			</xs:simpleType>
-		</xs:attribute>
-	</xs:complexType>
-	<xs:complexType name="criteria">
-		<xs:annotation>
-			<xs:appinfo>
-				<xdat:element ignoreWarnings="true"/>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="field" type="xs:string" minOccurs="0"/>
-			<xs:element name="comparison_type" type="xs:string" minOccurs="0"/>
-			<xs:element name="custom_search" type="xs:string" minOccurs="0"/>
-			<xs:element name="value" type="xs:string" minOccurs="0"/>
-		</xs:sequence>
-		<xs:attribute name="override_value_formatting" type="xs:boolean" use="optional" default="0"/>
-	</xs:complexType>
-	<xs:complexType name="fieldType" abstract="true">
-		<xs:attribute name="header" type="xs:string" use="optional"/>
-		<xs:attribute name="visible" type="xs:boolean" use="optional"/>
-		<xs:attribute name="ID" type="xs:string" use="required"/>
-		<xs:attribute name="aggregate" use="optional">
-			<xs:simpleType>
-				<xs:restriction base="xs:string">
-					<xs:enumeration value="COUNT"/>
-					<xs:enumeration value="MIN"/>
-					<xs:enumeration value="MAX"/>
-					<xs:enumeration value="SUM"/>
-					<xs:enumeration value="CONCAT"/>
-				</xs:restriction>
-			</xs:simpleType>
-		</xs:attribute>
-	</xs:complexType>
-	<xs:complexType name="joinType" abstract="true">
-		<xs:attribute name="alias" type="xs:string" use="optional"/>
-	</xs:complexType>
-	<xs:complexType name="schemaField">
-		<xs:complexContent>
-			<xs:extension base="search:fieldType">
-				<xs:attribute name="XPATH" type="xs:string" use="optional"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="customField">
-		<xs:complexContent>
-			<xs:extension base="search:fieldType"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="schemaJoin">
-		<xs:complexContent>
-			<xs:extension base="search:joinType"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="dbViewJoin">
-		<xs:complexContent>
-			<xs:extension base="search:joinType"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="subQueryJoin">
-		<xs:complexContent>
-			<xs:extension base="search:joinType"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="preDefinedField">
-		<xs:complexContent>
-			<xs:extension base="search:fieldType"/>
-		</xs:complexContent>
-	</xs:complexType>
-</xs:schema>
diff --git a/src/main/webapp/schemas/security/display/element_security_display.xml b/src/main/webapp/schemas/security/display/element_security_display.xml
deleted file mode 100644
index 1543a6aa..00000000
--- a/src/main/webapp/schemas/security/display/element_security_display.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!--Sample XML file generated by XMLSPY v2004 rel. 3 U (http://www.xmlspy.com)-->
<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xdat:element_security">
	<DisplayField id="ELEMENT_NAME" header="Element" visible="true">
		<DisplayFieldElement name="Field1" schema-element="xdat:element_security.element_name"/>
		<HTML-Link>
			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xdat:element_security/search_field/xdat:element_security.element_name">
				<InsertValue id="Field1" field="ELEMENT_NAME"/>
			</Property>
			<Property name="ONCLICK" value="return rpt('@Field1','xdat:element_security','xdat:element_security.element_name');">
				<InsertValue id="Field1" field="ELEMENT_NAME"/>
			</Property>
		</HTML-Link>
	</DisplayField>
	<DisplayField id="SECURE" header="Secured" visible="true" sort-order="DESC" image="true">
		<DisplayFieldElement name="Field1" schema-element="xdat:element_security.secure"/>
		<Content type="sql">CASE @Field1 WHEN 1 THEN '/@WEBAPP/images/cg.gif' WHEN 0 THEN '/@WEBAPP/images/cr.gif' END</Content>
	</DisplayField>
	<DisplayField id="BROWSE" header="Browse" visible="true" sort-order="DESC" image="true">
		<DisplayFieldElement name="Field1" schema-element="xdat:element_security.browse"/>
		<Content type="sql">CASE @Field1 WHEN 1 THEN '/@WEBAPP/images/cg.gif' WHEN 0 THEN '/@WEBAPP/images/cr.gif' END</Content>
	</DisplayField>
	<DisplayField id="SEQUENCE" header="Order" visible="true" sort-order="ASC">
		<DisplayFieldElement name="Field1" schema-element="xdat:element_security.sequence"/>
	</DisplayField>
	<DisplayVersion versionName="listing" default-order-by="ELEMENT_NAME" brief-description="Users" dark-color="DEDEDE" light-color="FFFFFF">
		<DisplayFieldRef id="ELEMENT_NAME"/>
		<DisplayFieldRef id="SECURE"/>
		<DisplayFieldRef id="BROWSE"/>
	</DisplayVersion>
</Displays>
\ No newline at end of file
diff --git a/src/main/webapp/schemas/security/display/role_type_display.xml b/src/main/webapp/schemas/security/display/role_type_display.xml
deleted file mode 100644
index 3754f40b..00000000
--- a/src/main/webapp/schemas/security/display/role_type_display.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!-- edited with XMLSPY v2004 rel. 3 U (http://www.xmlspy.com) by Tim Olsen (Washington University) -->
<!--Sample XML file generated by XMLSPY v2004 rel. 3 U (http://www.xmlspy.com)-->
<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xdat:role_type">
	<DisplayField id="ROLE_NAME" header="Role" visible="true">
		<DisplayFieldElement name="Field1" schema-element="xdat:role_type.role_name"/>
		<HTML-Link>
			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xdat:role_type/search_field/xdat:role_type.role_name">
				<InsertValue id="Field1" field="ROLE_NAME"/>
			</Property>
			<Property name="ONCLICK" value="return rpt('@Field1','xdat:role_type','xdat:role_type.role_name');">
				<InsertValue id="Field1" field="ROLE_NAME"/>
			</Property>
		</HTML-Link>
	</DisplayField>
	<DisplayField id="RPT" header="" visible="true" image="true">
		<Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
		<HTML-Link>
			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xdat:role_type/search_field/xdat:role_type.role_name">
				<InsertValue id="Field1" field="ROLE_NAME"/>
			</Property>
			<Property name="ONCLICK" value="return rpt('@Field1','xdat:role_type','xdat:role_type.role_name');">
				<InsertValue id="Field1" field="ROLE_NAME"/>
			</Property>
		</HTML-Link>
	</DisplayField>
	<DisplayField id="ACTIVE" header="" visible="true" image="true">
		<DisplayFieldElement name="Field1" schema-element="xdat:role_type.meta.status"/>
		<Content type="sql">CASE @Field1 WHEN 'active' THEN '/@WEBAPP/images/cg.gif' ELSE  '/@WEBAPP/images/cr.gif' END</Content>
	</DisplayField>
	<DisplayField id="DESCRIPTION" header="Description" visible="true">
		<DisplayFieldElement name="Field1" schema-element="xdat:role_type.description"/>
	</DisplayField>
	<DisplayField id="ACTION_COUNT" header="Actions" visible="true">
		<DisplayFieldElement name="Field1" viewName="ROLE_COUNT" viewColumn="ACTION_COUNT"/>
	</DisplayField>
	<DisplayField id="SEQ" header="Sequence" visible="true">
		<DisplayFieldElement name="Field1" schema-element="xdat:role_type.sequence"/>
	</DisplayField>
	<DisplayVersion versionName="listing" default-order-by="ROLE_NAME" brief-description="Users" dark-color="DEDEDE" light-color="FFFFFF">
		<DisplayFieldRef id="ROLE_NAME"/>
		<DisplayFieldRef id="DESCRIPTION"/>
		<DisplayFieldRef id="SEQ"/>
		<DisplayFieldRef id="ACTION_COUNT"/>
	</DisplayVersion>
	<ViewLink alias="ROLE_COUNT">
		<Mapping TableName="ROLE_COUNT">
			<MappingColumn rootElement="xdat:role_type" fieldElement="xdat:role_type.role_name" mapsTo="role1"/>
		</Mapping>
	</ViewLink>
	<SQLView name="ROLE_COUNT" sql="SELECT role_name AS role1,COUNT (map.xdat_a_xdat_action_type_allowe_xdat_role_type_id) AS ACTION_COUNT FROM xdat_role_type role LEFT JOIN xdat_a_xdat_action_type_allowe_xdat_role_type map ON role.role_name=map.xdat_role_type_role_name GROUP BY role_name"/>
</Displays>
diff --git a/src/main/webapp/schemas/security/display/user_display.xml b/src/main/webapp/schemas/security/display/user_display.xml
deleted file mode 100644
index 485a7fff..00000000
--- a/src/main/webapp/schemas/security/display/user_display.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v2004 rel. 3 U (http://www.xmlspy.com) by Tim Olsen (Washington University) -->
-<!--Sample XML file generated by XMLSPY v2004 rel. 3 U (http://www.xmlspy.com)-->
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xdat:user">
-	<DisplayField id="LOGIN" header="Username" visible="true">
-		<DisplayFieldElement name="Field1" schema-element="xdat:user.login"/>
-		<HTML-Link>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xdat:user/search_field/xdat:user.login">
-				<InsertValue id="Field1" field="LOGIN"/>
-			</Property>
-			<Property name="ONCLICK" value="return rpt('@Field1','xdat:user','xdat:user.login');">
-				<InsertValue id="Field1" field="LOGIN"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="SU" header="" visible="true" image="true">
-		<Content type="sql">'/@WEBAPP/images/su.jpg'::text</Content>
-		<HTML-Link>
-			<Property name="HREF" value="@WEBAPPapp/action/XDATSudoLogin/sudo_login/@Field1">
-				<InsertValue id="Field1" field="LOGIN"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="RPT" header="" visible="true" image="true">
-		<Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
-		<HTML-Link>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xdat:user/search_field/xdat:user.login">
-				<InsertValue id="Field1" field="LOGIN"/>
-			</Property>
-			<Property name="ONCLICK" value="return rpt('@Field1','xdat:user','xdat:user.login');">
-				<InsertValue id="Field1" field="LOGIN"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="ACTIVE" header="Auth." visible="true" image="true">
-		<DisplayFieldElement name="Field1" schema-element="xdat:user.meta.status"/>
-		<Content type="sql">CASE @Field1 WHEN 'active' THEN '/@WEBAPP/images/cg.gif' ELSE  '/@WEBAPP/images/cr.gif' END</Content>
-	</DisplayField>
-	<DisplayField id="FIRST" header="First name" visible="true" sort-order="ASC">
-		<DisplayFieldElement name="Field1" schema-element="xdat:user.firstname"/>
-	</DisplayField>
-	<DisplayField id="LAST" header="Last name" visible="true" sort-order="ASC">
-		<DisplayFieldElement name="Field1" schema-element="xdat:user.lastname"/>
-	</DisplayField>
-	<DisplayField id="FIRST_LAST" header="Name" visible="true" sort-order="ASC">
-		<DisplayFieldElement name="Field1" schema-element="xdat:user.firstname"/>
-		<DisplayFieldElement name="Field2" schema-element="xdat:user.lastname"/>
-		<Content type="sql">@Field2 || ', ' || @Field1</Content>
-	</DisplayField>
-	<DisplayField id="EMAIL" header="Email" visible="true" sort-order="ASC">
-		<DisplayFieldElement name="Field1" schema-element="xdat:user.email"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return email('@Field1');">
-				<InsertValue id="Field1" field="EMAIL"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="LAST_LOGIN" header="Last Login" visible="true" sort-order="ASC">
-		<DisplayFieldElement name="Field1" viewName="LAST_LOGIN" viewColumn="LOGIN_DATE"/>
-		<Content type="sql">CAST (@Field1 AS VARCHAR)</Content>
-	</DisplayField>
-	<DisplayField id="SESSION_ID" header="Session Id" visible="true" sort-order="ASC">
-		<DisplayFieldElement name="Field1" viewName="SESSION_ID" viewColumn="SESSION_ID"/>
-		<Content type="sql">CAST (@Field1 AS VARCHAR)</Content>
-	</DisplayField>
-	<DisplayField id="ENABLED" header="Enabled" visible="true" sort-order="DESC" image="true">
-		<DisplayFieldElement name="Field1" schema-element="xdat:user.enabled"/>
-		<Content type="sql">CASE @Field1 WHEN 1 THEN '/@WEBAPP/images/cg.gif' WHEN 0 THEN '/@WEBAPP/images/cr.gif' END</Content>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="FIRST_LAST" brief-description="Users" dark-color="DEDEDE" light-color="FFFFFF">
-		<DisplayFieldRef id="SU"/>
-		<DisplayFieldRef id="LOGIN"/>
-		<DisplayFieldRef id="FIRST_LAST"/>
-		<DisplayFieldRef id="EMAIL"/>
-		<DisplayFieldRef id="LAST_LOGIN"/>
-		<DisplayFieldRef id="ACTIVE"/>
-		<DisplayFieldRef id="ENABLED"/>
-	</DisplayVersion>
-	<ViewLink alias="LAST_LOGIN">
-		<Mapping TableName="LAST_LOGIN">
-			<MappingColumn rootElement="xdat:user" fieldElement="xdat:user.xdat_user_id" mapsTo="USER_ID"/>
-		</Mapping>
-	</ViewLink>
-	<SQLView name="LAST_LOGIN" sql="select DISTINCT ON (user_xdat_user_id) user_xdat_user_id AS USER_ID, login_date FROM xdat_user_login ORDER BY user_xdat_user_id,login_date DESC"/>
-	<SQLFunction name="sortedstrings " content="CREATE TYPE sortedstrings AS
-   (strings &quot;varchar&quot;,
-    sort_order int4);"/>
-	<SQLFunction name="getnextview" content="CREATE OR REPLACE FUNCTION getnextview()   RETURNS name AS 
-E' DECLARE   my_record RECORD;  viewName name; 
-BEGIN  FOR my_record IN SELECT c.relname FROM pg_catalog.pg_class AS c LEFT JOIN pg_catalog.pg_namespace AS n ON n.oid = c.relnamespace 
-WHERE     c.relkind IN (''v'') AND n.nspname NOT IN (''pg_catalog'', ''pg_toast'') AND pg_catalog.pg_table_is_visible(c.oid) LIMIT 1  
-LOOP   viewName := my_record.relname;  END LOOP;  RETURN (viewName); END; '  LANGUAGE 'plpgsql' VOLATILE;"/>
-	<SQLFunction name="viewcount" content="CREATE OR REPLACE FUNCTION viewcount()   RETURNS int8 AS E' DECLARE   my_record RECORD;  counter int8; 
-BEGIN  FOR my_record IN SELECT * FROM (SELECT COUNT (c.relname) AS view_count FROM pg_catalog.pg_class AS c 
-LEFT JOIN pg_catalog.pg_namespace AS n ON n.oid = c.relnamespace WHERE     c.relkind IN (''v'') AND n.nspname 
-NOT IN (''pg_catalog'', ''pg_toast'') AND pg_catalog.pg_table_is_visible(c.oid) LIMIT 1) AS COUNT_TABLE  LOOP   counter := my_record.view_count;  
-END LOOP;  RETURN (counter); END; '  LANGUAGE 'plpgsql' VOLATILE;"/>
-	<SQLFunction name="getsortedstring" content="CREATE OR REPLACE FUNCTION getsortedstring(&quot;varchar&quot;, int4)   RETURNS sortedstrings AS E'DECLARE  sorted_strings sortedStrings%ROWTYPE; 
-BEGIN  sorted_strings.strings:=$1;  sorted_strings.sort_order:=$2;  return sorted_strings; END;'   LANGUAGE 'plpgsql' VOLATILE;"/>
-	<SQLFunction name="removeviews" content="CREATE OR REPLACE FUNCTION removeviews()   RETURNS varchar AS E' DECLARE  viewName name;  viewCounter int8; 
-BEGIN  SELECT INTO viewName getnextview();  SELECT INTO viewCounter viewCount();  WHILE (viewCounter > 0)   LOOP   
-EXECUTE ''DROP VIEW ''|| viewName || '' CASCADE'';   RAISE NOTICE ''DROPPED %. % more.'',viewName,viewCounter;   SELECT INTO viewName getnextview();   
-SELECT INTO viewCounter viewCount();  END LOOP;   RETURN (''DONE''); END; '   LANGUAGE 'plpgsql' VOLATILE;"/>
-	<SQLFunction name="stringstosortedtable" content="CREATE OR REPLACE FUNCTION stringstosortedtable(varchar[])
-  RETURNS SETOF sortedstrings AS
-'DECLARE  
-ss sortedstrings%ROWTYPE; 
-i int4;  
-BEGIN  
-	i :=1 ;
-	WHILE ($1[i] IS NOT NULL) 
-	LOOP   
-		FOR ss IN 
-			SELECT * FROM getSortedString($1[i],i) 
-		LOOP
-			RAISE NOTICE ''SORTED STRING: %,%'',ss.strings,ss.sort_order;
-			RETURN NEXT ss;
-		END LOOP;
-		i:=i+1;  
-	END LOOP; 
-	RETURN; 
-END;'
-  LANGUAGE 'plpgsql' VOLATILE;"/>
-</Displays>
diff --git a/src/main/webapp/schemas/security/display/xdat_infoEntry_display.xml b/src/main/webapp/schemas/security/display/xdat_infoEntry_display.xml
deleted file mode 100644
index 519c309c..00000000
--- a/src/main/webapp/schemas/security/display/xdat_infoEntry_display.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ D:/Development/XNAT/1.6/xnat_builder_1_6dev/plugin-resources/project-skeletons/xnat/src/schemas/security/display/xdat_infoEntry_display.xml
-  ~ XNAT http://www.xnat.org
-  ~ Copyright (c) 2014, Washington University School of Medicine
-  ~ All Rights Reserved
-  ~
-  ~ Released under the Simplified BSD.
-  ~
-  ~ Last modified 2/7/14 12:19 PM
-  -->
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xdat:infoEntry" full-description="Info" brief-description="Info">
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xdat:infoEntry.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xdat:infoEntry.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayField id="DATE" header="date" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xdat:infoEntry/date"/>
-	</DisplayField>
-	<DisplayField id="TITLE" header="title" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xdat:infoEntry/title"/>
-	</DisplayField>
-	<DisplayField id="DESCRIPTION" header="description" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xdat:infoEntry/description"/>
-	</DisplayField>
-	<DisplayField id="LINK" header="link" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xdat:infoEntry/link"/>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="Info" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="TITLE"/>
-		<DisplayFieldRef id="DESCRIPTION"/>
-		<DisplayFieldRef id="LINK"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="Info" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="TITLE"/>
-		<DisplayFieldRef id="DESCRIPTION"/>
-		<DisplayFieldRef id="LINK"/>
-	</DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/security/display/xdat_newsEntry_display.xml b/src/main/webapp/schemas/security/display/xdat_newsEntry_display.xml
deleted file mode 100644
index a055ff9b..00000000
--- a/src/main/webapp/schemas/security/display/xdat_newsEntry_display.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ D:/Development/XNAT/1.6/xnat_builder_1_6dev/plugin-resources/project-skeletons/xnat/src/schemas/security/display/xdat_newsEntry_display.xml
-  ~ XNAT http://www.xnat.org
-  ~ Copyright (c) 2014, Washington University School of Medicine
-  ~ All Rights Reserved
-  ~
-  ~ Released under the Simplified BSD.
-  ~
-  ~ Last modified 2/7/14 12:19 PM
-  -->
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xdat:newsEntry" full-description="News" brief-description="News">
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xdat:newsEntry.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xdat:newsEntry.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayField id="DATE" header="date" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xdat:newsEntry/date"/>
-	</DisplayField>
-	<DisplayField id="TITLE" header="title" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xdat:newsEntry/title"/>
-	</DisplayField>
-	<DisplayField id="DESCRIPTION" header="description" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xdat:newsEntry/description"/>
-	</DisplayField>
-	<DisplayField id="LINK" header="link" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xdat:newsEntry/link"/>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="News" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="TITLE"/>
-		<DisplayFieldRef id="DESCRIPTION"/>
-		<DisplayFieldRef id="LINK"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="News" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="TITLE"/>
-		<DisplayFieldRef id="DESCRIPTION"/>
-		<DisplayFieldRef id="LINK"/>
-	</DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/security/display/xdat_stored_search_display.xml b/src/main/webapp/schemas/security/display/xdat_stored_search_display.xml
deleted file mode 100644
index a5f8d0b3..00000000
--- a/src/main/webapp/schemas/security/display/xdat_stored_search_display.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ D:/Development/XNAT/1.6/xnat_builder_1_6dev/plugin-resources/project-skeletons/xnat/src/schemas/security/display/xdat_stored_search_display.xml
-  ~ XNAT http://www.xnat.org
-  ~ Copyright (c) 2014, Washington University School of Medicine
-  ~ All Rights Reserved
-  ~
-  ~ Released under the Simplified BSD.
-  ~
-  ~ Last modified 2/7/14 12:19 PM
-  -->
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xdat:stored_search" full-description="Bundles" brief-description="Bundles">
-	<DisplayField id="ROOT_ELEMENT_NAME" header="pivot" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xdat:stored_search/root_element_name"/>
-	</DisplayField>
-	<DisplayField id="SORT_BY_ELEMENT_NAME" header="sort by" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xdat:stored_search/sort_by/element_name"/>
-	</DisplayField>
-	<DisplayField id="SORT_BY_FIELD_ID" header="sort by" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xdat:stored_search/sort_by/field_ID"/>
-	</DisplayField>
-	<DisplayField id="LAYERED_SEQUENCE" header="Sequence" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xdat:stored_search/layeredSequence"/>
-	</DisplayField>
-	<DisplayField id="ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xdat:stored_search/ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xdat:stored_search/search_field/xdat:stored_search.ID">
-				<InsertValue id="Field1" field="ID"/>
-			</Property>
-			<Property name="ONCLICK" value="return rpt('@Field1','xdat:stored_search','xdat:stored_search.ID');">
-				<InsertValue id="Field1" field="ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="DESCRIPTION" header="Full Desc" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xdat:stored_search/description"/>
-	</DisplayField>
-	<DisplayField id="BRIEF_DESCRIPTION" header="Brief Desc" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xdat:stored_search/brief-description"/>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="ROOT_ELEMENT_NAME" default-sort-order="DESC" brief-description="bundle" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="BRIEF_DESCRIPTION"/>
-		<DisplayFieldRef id="DESCRIPTION"/>
-		<DisplayFieldRef id="ROOT_ELEMENT_NAME"/>
-		<DisplayFieldRef id="SORT_BY_ELEMENT_NAME"/>
-		<DisplayFieldRef id="SORT_BY_FIELD_ID"/>
-		<DisplayFieldRef id="LAYERED_SEQUENCE"/>
-	</DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/security/display/xdat_userGroup_display.xml b/src/main/webapp/schemas/security/display/xdat_userGroup_display.xml
deleted file mode 100644
index bb1a5a9e..00000000
--- a/src/main/webapp/schemas/security/display/xdat_userGroup_display.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!-- edited with XMLSPY v2004 rel. 3 U (http://www.xmlspy.com) by Tim Olsen (Washington University) -->
<!--Sample XML file generated by XMLSPY v2004 rel. 3 U (http://www.xmlspy.com)-->
<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xdat:userGroup">
	<DisplayField id="ID" header="ID" visible="true">
		<DisplayFieldElement name="Field1" schema-element="xdat:userGroup.id"/>
		<HTML-Link>
			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xdat:userGroup/search_field/xdat:userGroup.ID">
				<InsertValue id="Field1" field="ID"/>
			</Property>
			<!--<Property name="ONCLICK" value="return rpt('@Field1','xdat:userGroup','xdat:userGroup.ID');">-->
				<!--<InsertValue id="Field1" field="ID"/>-->
			<!--</Property>-->
		</HTML-Link>
	</DisplayField>
	<DisplayField id="DISPLAY_NAME" header="Name" visible="true" sort-order="ASC">
		<DisplayFieldElement name="Field1" schema-element="xdat:userGroup.displayName"/>
	</DisplayField>
	<DisplayVersion versionName="listing" default-order-by="ID" brief-description="Users" dark-color="DEDEDE" light-color="FFFFFF">
		<DisplayFieldRef id="ID"/>
		<DisplayFieldRef id="DISPLAY_NAME"/>
	</DisplayVersion>
</Displays>
\ No newline at end of file
diff --git a/src/main/webapp/schemas/security/security.xsd b/src/main/webapp/schemas/security/security.xsd
deleted file mode 100644
index 5d5ed633..00000000
--- a/src/main/webapp/schemas/security/security.xsd
+++ /dev/null
@@ -1,865 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v2004 rel. 3 U (http://www.xmlspy.com) by Tim Olsen (Washington University) -->
-<xs:schema targetNamespace="http://nrg.wustl.edu/security" xmlns:xdat="http://nrg.wustl.edu/security" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<xs:element name="security">
-		<xs:annotation>
-			<xs:documentation>Comment describing your root element</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:sequence minOccurs="0">
-				<xs:element name="groups" minOccurs="0">
-					<xs:complexType>
-						<xs:sequence minOccurs="0">
-							<xs:element name="group" type="xdat:userGroup" minOccurs="0" maxOccurs="unbounded"/>
-						</xs:sequence>
-					</xs:complexType>
-				</xs:element>
-				<xs:element name="users" minOccurs="0">
-					<xs:complexType>
-						<xs:sequence>
-							<xs:element name="user" type="xdat:user" minOccurs="0" maxOccurs="unbounded">
-								<xs:annotation>
-									<xs:appinfo>
-										<xdat:field>
-											<xdat:relation relationType="single"/>
-										</xdat:field>
-									</xs:appinfo>
-								</xs:annotation>
-							</xs:element>
-						</xs:sequence>
-					</xs:complexType>
-				</xs:element>
-				<xs:element name="roles" minOccurs="0">
-					<xs:complexType>
-						<xs:sequence>
-							<xs:element name="role" type="xdat:role_type" maxOccurs="unbounded"/>
-						</xs:sequence>
-					</xs:complexType>
-				</xs:element>
-				<xs:element name="actions" minOccurs="0">
-					<xs:complexType>
-						<xs:sequence>
-							<xs:element name="action" type="xdat:action_type" maxOccurs="unbounded"/>
-						</xs:sequence>
-					</xs:complexType>
-				</xs:element>
-				<xs:element name="element_security_set" minOccurs="0">
-					<xs:complexType>
-						<xs:sequence>
-							<xs:element name="element_security" type="xdat:element_security" maxOccurs="unbounded">
-								<xs:annotation>
-									<xs:appinfo>
-										<xdat:field>
-											<xdat:relation relationType="single"/>
-										</xdat:field>
-									</xs:appinfo>
-								</xs:annotation>
-							</xs:element>
-						</xs:sequence>
-					</xs:complexType>
-				</xs:element>
-				<xs:element name="newsList" minOccurs="0">
-					<xs:complexType>
-						<xs:sequence minOccurs="0">
-							<xs:element name="news" type="xdat:newsEntry" minOccurs="0"/>
-						</xs:sequence>
-					</xs:complexType>
-				</xs:element>
-				<xs:element name="infoList" minOccurs="0">
-					<xs:complexType>
-						<xs:sequence minOccurs="0">
-							<xs:element name="info" type="xdat:infoEntry" minOccurs="0"/>
-						</xs:sequence>
-					</xs:complexType>
-				</xs:element>
-			</xs:sequence>
-			<xs:attribute name="system" type="xs:string" use="required">
-				<xs:annotation>
-					<xs:appinfo>
-						<xdat:field unique="true"/>
-					</xs:appinfo>
-				</xs:annotation>
-			</xs:attribute>
-			<xs:attribute name="require_login" type="xs:boolean" use="required"/>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="element_access">
-		<xs:annotation>
-			<xs:appinfo>
-				<xdat:element displayIdentifiers="element_name"/>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="secondary_password" minOccurs="0">
-					<xs:complexType>
-						<xs:simpleContent>
-							<xs:extension base="xs:string">
-								<xs:attribute name="encrypt" type="xs:boolean"/>
-							</xs:extension>
-						</xs:simpleContent>
-					</xs:complexType>
-				</xs:element>
-				<xs:element name="secure_ip" type="xs:string" minOccurs="0" maxOccurs="unbounded">
-					<xs:annotation>
-						<xs:appinfo>
-							<xdat:field uniqueComposite="UNIQUE">
-								<xdat:relation uniqueComposite="UNIQUE" relationType="single"/>
-							</xdat:field>
-						</xs:appinfo>
-					</xs:annotation>
-				</xs:element>
-				<xs:element name="permissions" minOccurs="0">
-					<xs:complexType>
-						<xs:sequence>
-							<xs:element name="allow_set" type="xdat:field_mapping_set" maxOccurs="unbounded">
-								<xs:annotation>
-									<xs:appinfo>
-										<xdat:field>
-											<xdat:relation relationType="single"/>
-										</xdat:field>
-									</xs:appinfo>
-								</xs:annotation>
-							</xs:element>
-						</xs:sequence>
-					</xs:complexType>
-				</xs:element>
-			</xs:sequence>
-			<xs:attribute name="element_name" type="xs:string" use="required">
-				<xs:annotation>
-					<xs:appinfo>
-						<xdat:field uniqueComposite="user_access,group_access"/>
-					</xs:appinfo>
-				</xs:annotation>
-			</xs:attribute>
-		</xs:complexType>
-	</xs:element>
-	<xs:complexType name="field_mapping">
-		<xs:annotation>
-			<xs:appinfo>
-				<xdat:element ignoreWarnings="true" displayIdentifiers="field_value"/>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:attribute name="field" type="xs:string" use="required"/>
-		<xs:attribute name="field_value" type="xs:string" use="required"/>
-		<xs:attribute name="create_element" type="xs:boolean" default="false"/>
-		<xs:attribute name="read_element" type="xs:boolean" default="false"/>
-		<xs:attribute name="edit_element" type="xs:boolean" default="false"/>
-		<xs:attribute name="delete_element" type="xs:boolean" default="false"/>
-		<xs:attribute name="active_element" type="xs:boolean" default="false"/>
-		<xs:attribute name="comparison_type">
-			<xs:simpleType>
-				<xs:restriction base="xs:string">
-					<xs:enumeration value="equals"/>
-					<xs:enumeration value="greater than"/>
-					<xs:enumeration value="less than"/>
-					<xs:enumeration value="greater than or equals"/>
-					<xs:enumeration value="less than or equals"/>
-					<xs:enumeration value="like"/>
-				</xs:restriction>
-			</xs:simpleType>
-		</xs:attribute>
-	</xs:complexType>
-	<xs:complexType name="field_mapping_set">
-		<xs:annotation>
-			<xs:appinfo>
-				<xdat:element ignoreWarnings="true" displayIdentifiers="method"/>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="allow" type="xdat:field_mapping" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:appinfo>
-						<xdat:field>
-							<xdat:relation relationType="single"/>
-						</xdat:field>
-					</xs:appinfo>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="sub_set" type="xdat:field_mapping_set" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:appinfo>
-						<xdat:field>
-							<xdat:relation relationType="single"/>
-						</xdat:field>
-					</xs:appinfo>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-		<xs:attribute name="method">
-			<xs:simpleType>
-				<xs:restriction base="xs:string">
-					<xs:enumeration value="AND"/>
-					<xs:enumeration value="OR"/>
-				</xs:restriction>
-			</xs:simpleType>
-		</xs:attribute>
-	</xs:complexType>
-	<xs:complexType name="role_type">
-		<xs:annotation>
-			<xs:appinfo>
-				<xdat:element displayIdentifiers="role_name"/>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="allowed_actions" minOccurs="0">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="allowed_action" type="xdat:action_type" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:appinfo>
-									<xdat:field>
-										<xdat:relation relationType="multi"/>
-									</xdat:field>
-								</xs:appinfo>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-		</xs:sequence>
-		<xs:attribute name="role_name" type="xs:string" use="required">
-			<xs:annotation>
-				<xs:appinfo>
-					<xdat:field size="255">
-						<xdat:sqlField primaryKey="true"/>
-					</xdat:field>
-				</xs:appinfo>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="description" type="xs:string" use="optional"/>
-		<xs:attribute name="sequence" type="xs:integer" use="optional" default="0"/>
-	</xs:complexType>
-	<xs:complexType name="action_type">
-		<xs:attribute name="action_name" type="xs:string" use="required">
-			<xs:annotation>
-				<xs:appinfo>
-					<xdat:field>
-						<xdat:sqlField primaryKey="true"/>
-					</xdat:field>
-				</xs:appinfo>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="display_name" type="xs:string" use="optional"/>
-		<xs:attribute name="sequence" type="xs:integer" use="optional" default="0"/>
-	</xs:complexType>
-	<xs:complexType name="primary_security_field">
-		<xs:annotation>
-			<xs:appinfo>
-				<xdat:element  displayIdentifiers="primary_security_field"/>
-				<xdat:field uniqueComposite="UNIQUE" size="255"/>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:simpleContent>
-			<xs:extension base="xs:string"/>
-		</xs:simpleContent>
-	</xs:complexType>
-	<xs:complexType name="element_security">
-		<xs:annotation>
-			<xs:appinfo>
-				<xdat:element displayIdentifiers="element_name"/>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="primary_security_fields" minOccurs="0">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="primary_security_field" type="xdat:primary_security_field" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:appinfo>
-									<xdat:field>
-										<xdat:relation uniqueComposite="UNIQUE" relationType="single"/>
-									</xdat:field>
-								</xs:appinfo>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="element_actions" minOccurs="0">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="element_action" type="xdat:element_action_type" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:appinfo>
-									<xdat:field>
-										<xdat:relation relationType="single" uniqueComposite="true"/>
-									</xdat:field>
-								</xs:appinfo>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="listing_actions" minOccurs="0">
-				<xs:complexType>
-					<xs:sequence minOccurs="0">
-						<xs:element name="listing_action" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:appinfo>
-									<xdat:element  displayIdentifiers="element_action_name"/>
-									<xdat:field>
-										<xdat:relation relationType="single" uniqueComposite="true"/>
-									</xdat:field>
-								</xs:appinfo>
-							</xs:annotation>
-							<xs:complexType>
-								<xs:attribute name="element_action_name" type="xs:string" use="required">
-									<xs:annotation>
-										<xs:appinfo>
-											<xdat:field uniqueComposite="true"/>
-										</xs:appinfo>
-									</xs:annotation>
-								</xs:attribute>
-								<xs:attribute name="display_name" type="xs:string" use="required"/>
-								<xs:attribute name="sequence" type="xs:integer" use="optional" default="0"/>
-								<xs:attribute name="image" type="xs:string" use="optional"/>
-                                <xs:attribute name="popup" type="xs:string" use="optional"/>
-								<xs:attribute name="secureAccess" use="optional" type="xs:string"/>
-								<xs:attribute name="secureFeature" use="optional" type="xs:string"/>
-								<xs:attribute name="parameterString" type="xs:string"/>
-							</xs:complexType>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-		</xs:sequence>
-		<xs:attribute name="element_name" type="xs:string">
-			<xs:annotation>
-				<xs:appinfo>
-					<xdat:field>
-						<xdat:sqlField primaryKey="true"/>
-					</xdat:field>
-				</xs:appinfo>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="secondary_password" type="xs:boolean"/>
-		<xs:attribute name="secure_ip" type="xs:boolean" default="false"/>
-		<xs:attribute name="secure" type="xs:boolean" use="optional" default="true"/>
-		<xs:attribute name="browse" type="xs:boolean" use="optional" default="true"/>
-		<xs:attribute name="sequence" type="xs:integer" use="optional" default="0"/>
-		<xs:attribute name="quarantine" type="xs:boolean" use="optional"/>
-		<xs:attribute name="pre_load" type="xs:boolean" use="optional" default="false"/>
-		<xs:attribute name="searchable" type="xs:boolean" use="optional"/>
-		<xs:attribute name="secure_read" type="xs:boolean" use="optional" default="true"/>
-		<xs:attribute name="secure_edit" type="xs:boolean" use="optional" default="true"/>
-		<xs:attribute name="secure_create" type="xs:boolean" use="optional" default="true"/>
-		<xs:attribute name="secure_delete" type="xs:boolean" use="optional" default="true"/>
-		<xs:attribute name="accessible" type="xs:boolean" use="optional"/>
-		<xs:attribute name="usage" type="xs:string" use="optional"/>
-		<xs:attribute name="singular" type="xs:string" use="optional"/>
-		<xs:attribute name="plural" type="xs:string" use="optional"/>
-		<xs:attribute name="category" type="xs:string" use="optional"/>
-		<xs:attribute name="code" type="xs:string" use="optional"/>
-	</xs:complexType>
-	<xs:complexType name="element_action_type">
-		<xs:annotation>
-			<xs:appinfo>
-				<xdat:element displayIdentifiers="element_action_name"/>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:attribute name="element_action_name" type="xs:string" use="required">
-			<xs:annotation>
-				<xs:appinfo>
-					<xdat:field uniqueComposite="true"/>
-				</xs:appinfo>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="display_name" type="xs:string" use="required"/>
-		<xs:attribute name="sequence" type="xs:integer" use="optional" default="0"/>
-		<xs:attribute name="image" type="xs:string" use="optional"/>
-        <xs:attribute name="popup" type="xs:string" use="optional"/>
-        <xs:attribute name="secureAccess" use="optional" type="xs:string"/>
-		<xs:attribute name="secureFeature" use="optional" type="xs:string"/>
-		<xs:attribute name="parameterString" type="xs:string" use="optional"/>
-		<xs:attribute name="grouping" type="xs:string" use="optional"/>
-	</xs:complexType>
-	<xs:complexType name="user">
-		<xs:annotation>
-			<xs:appinfo>
-				<xdat:element displayIdentifiers="login"/>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="login">
-				<xs:annotation>
-					<xs:appinfo>
-						<xdat:field unique="true"/>
-					</xs:appinfo>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="firstname" minOccurs="0"/>
-			<xs:element name="lastname" minOccurs="0"/>
-			<xs:element name="email" minOccurs="0"/>
-			<xs:element name="primary_password" minOccurs="0">
-				<xs:annotation>
-					<xs:appinfo>
-						<xdat:field xmlDisplay="root"/>
-					</xs:appinfo>
-				</xs:annotation>
-				<xs:complexType>
-					<xs:simpleContent>
-						<xs:extension base="xs:string">
-							<xs:attribute name="encrypt" type="xs:boolean"/>
-						</xs:extension>
-					</xs:simpleContent>
-				</xs:complexType>
-			</xs:element>
-			<xs:element ref="xdat:element_access" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:appinfo>
-						<xdat:field xmlDisplay="root">
-							<xdat:relation uniqueComposite="user_access" relationType="single"/>
-						</xdat:field>
-					</xs:appinfo>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="assigned_roles" minOccurs="0">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="assigned_role" type="xdat:role_type" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:appinfo>
-									<xdat:field xmlDisplay="root">
-										<xdat:relation relationType="multi"/>
-									</xdat:field>
-								</xs:appinfo>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="quarantine_path" minOccurs="0">
-				<xs:simpleType>
-					<xs:restriction base="xs:string">
-						<xs:maxLength value="255"/>
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:element>
-			<xs:element name="groups" minOccurs="0">
-				<xs:complexType>
-					<xs:sequence minOccurs="0">
-						<xs:element name="groupID" type="xs:string" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:appinfo>
-									<xdat:element displayIdentifiers="groupID"/>
-									<xdat:field displayName="user group" uniqueComposite="true" baseElement="xdat:userGroup" baseCol="ID">
-										<xdat:relation relationType="single" uniqueComposite="true"/>
-									</xdat:field>
-								</xs:appinfo>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-		</xs:sequence>
-		<xs:attribute name="enabled" type="xs:boolean" use="optional" default="true"/>
-		<xs:attribute name="verified" type="xs:boolean" use="optional" default="true"/>
-        <xs:attribute name="salt" type="xs:string" use="optional"/>
-	</xs:complexType>
-	<xs:attributeGroup name="meta_element">
-		<xs:annotation>
-			<xs:appinfo>
-				<xdat:element addin="extension"/>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:attribute name="element_name">
-			<xs:annotation>
-				<xs:appinfo>
-					<xdat:field unique="true"/>
-				</xs:appinfo>
-			</xs:annotation>
-			<xs:simpleType>
-				<xs:restriction base="xs:string">
-					<xs:maxLength value="250"/>
-				</xs:restriction>
-			</xs:simpleType>
-		</xs:attribute>
-	</xs:attributeGroup>
-	<xs:complexType name="meta_data">
-		<xs:annotation>
-			<xs:appinfo>
-				<xdat:element addin="global"/>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="insert_date" type="xs:dateTime" minOccurs="0"/>
-			<xs:element name="insert_user" type="xdat:user" minOccurs="0"/>
-			<xs:element name="activation_date" type="xs:dateTime" minOccurs="0"/>
-			<xs:element name="activation_user" type="xdat:user" minOccurs="0"/>
-			<xs:element name="last_modified" type="xs:dateTime" minOccurs="0"/>
-			<xs:element name="row_last_modified" type="xs:dateTime" minOccurs="0"/>
-			<xs:element name="xft_version" type="xs:string" minOccurs="0"/>
-			<xs:element name="origin" type="xs:string" minOccurs="0"/>
-		</xs:sequence>
-		<xs:attribute name="meta_data_id" type="xs:integer" use="required">
-			<xs:annotation>
-				<xs:appinfo>
-					<xdat:field>
-						<xdat:sqlField primaryKey="true" autoIncrement="true"/>
-					</xdat:field>
-				</xs:appinfo>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="shareable" type="xs:boolean" default="1"/>
-		<xs:attribute name="status" default="quarantine">
-			<xs:simpleType>
-				<xs:restriction base="xs:string">
-					<xs:enumeration value="active"/>
-					<xs:enumeration value="quarantine"/>
-					<xs:enumeration value="obsolete"/>
-					<xs:enumeration value="deleted"/>
-					<xs:enumeration value="locked"/>
-				</xs:restriction>
-			</xs:simpleType>
-		</xs:attribute>
-		<xs:attribute name="modified" type="xs:boolean" default="0"/>
-	</xs:complexType>
-	<xs:complexType name="history">
-		<xs:annotation>
-			<xs:appinfo>
-				<xdat:element addin="history" skipSql="true"/>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="new_row" type="xs:anyType">
-				<xs:annotation>
-					<xs:appinfo>
-						<xdat:field local_map="true" unique="true"/>
-					</xs:appinfo>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="change_user" type="xdat:user" minOccurs="0">
-				<xs:annotation>
-					<xs:appinfo>
-						<xdat:field>
-							<xdat:sqlField name="change_user"/>
-						</xdat:field>
-					</xs:appinfo>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-		<xs:attribute name="history_id" type="xs:integer">
-			<xs:annotation>
-				<xs:appinfo>
-					<xdat:field>
-						<xdat:sqlField primaryKey="true" autoIncrement="true" name="history_id"/>
-					</xdat:field>
-				</xs:appinfo>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="change_date" type="xs:dateTime"/>
-		<xs:attribute name="previous_change_date" type="xs:dateTime"/>
-	</xs:complexType>
-	<xs:complexType name="change_info">
-		<xs:sequence>
-			<xs:element name="change_user" type="xdat:user" minOccurs="0">
-				<xs:annotation>
-					<xs:appinfo>
-						<xdat:field>
-							<xdat:sqlField name="change_user"/>
-						</xdat:field>
-					</xs:appinfo>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="comment" type="xs:string" minOccurs="0"/>
-		</xs:sequence>
-		<xs:attribute name="change_date" type="xs:dateTime"/>
-		<xs:attribute name="event_id" type="xs:integer"/>
-		<xs:attribute name="xdat_change_info_id" type="xs:long">
-			<xs:annotation>
-				<xs:appinfo>
-					<xdat:field>
-						<xdat:sqlField primaryKey="true" type="bigserial" autoIncrement="true"/>
-					</xdat:field>
-				</xs:appinfo>
-			</xs:annotation>
-		</xs:attribute>
-	</xs:complexType>
-	<xs:complexType name="user_login">
-		<xs:sequence>
-			<xs:element name="login_date" type="xs:dateTime" minOccurs="0">
-				<xs:annotation>
-					<xs:appinfo>
-						<xdat:field uniqueComposite="UNIQUE"/>
-					</xs:appinfo>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="logout_date" type="xs:dateTime" minOccurs="0"/>
-			<xs:element name="session_id" type="xs:string" minOccurs="0"/>
-			<xs:element name="ip_address" type="xs:string" minOccurs="0"/>
-			<xs:element name="user" type="xdat:user">
-				<xs:annotation>
-					<xs:appinfo>
-						<xdat:field uniqueComposite="UNIQUE">
-						</xdat:field>
-					</xs:appinfo>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="stored_search">
-		<xs:sequence>
-			<xs:element name="root_element_name" type="xs:string"/>
-			<xs:element name="search_field" type="xdat:search_field" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:appinfo>
-						<xdat:field>
-							<xdat:relation relationType="single" uniqueComposite="true"/>
-						</xdat:field>
-					</xs:appinfo>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="search_where" type="xdat:criteria_set" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:appinfo>
-						<xdat:field>
-							<xdat:relation relationType="single"/>
-						</xdat:field>
-					</xs:appinfo>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="sort_by" minOccurs="0">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="element_name" type="xs:string" minOccurs="0"/>
-						<xs:element name="field_ID" type="xs:string" minOccurs="0"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="allowed_user" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:appinfo>
-						<xdat:field>
-							<xdat:relation relationType="single" uniqueComposite="true"/>
-						</xdat:field>
-					</xs:appinfo>
-				</xs:annotation>
-				<xs:complexType>
-					<xs:sequence minOccurs="0">
-						<xs:element name="login" type="xs:string" minOccurs="0">
-							<xs:annotation>
-								<xs:appinfo>
-									<xdat:field uniqueComposite="true"/>
-								</xs:appinfo>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="allowed_groups" minOccurs="0">
-				<xs:complexType>
-					<xs:sequence minOccurs="0">
-						<xs:element name="groupID" type="xs:string" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:appinfo>
-									<xdat:field uniqueComposite="true">
-										<xdat:relation relationType="single" uniqueComposite="true"/>
-									</xdat:field>
-								</xs:appinfo>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-		</xs:sequence>
-		<xs:attribute name="ID" type="xs:string">
-			<xs:annotation>
-				<xs:appinfo>
-					<xdat:field>
-						<xdat:sqlField primaryKey="true"/>
-					</xdat:field>
-				</xs:appinfo>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="description" type="xs:string"/>
-		<xs:attribute name="layeredSequence" type="xs:string" use="optional"/>
-		<xs:attribute name="allow-diff-columns" type="xs:boolean" use="optional" default="true"/>
-		<xs:attribute name="secure" type="xs:boolean" use="optional" default="true"/>
-		<xs:attribute name="brief-description" type="xs:string"/>
-		<xs:attribute name="tag" type="xs:string" use="optional"/>
-	</xs:complexType>
-	<xs:complexType name="criteria_set">
-		<xs:annotation>
-			<xs:appinfo>
-				<xdat:element ignoreWarnings="true" displayIdentifiers="method"/>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="criteria" type="xdat:criteria" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:appinfo>
-						<xdat:field>
-							<xdat:relation relationType="single"/>
-						</xdat:field>
-					</xs:appinfo>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="child_set" type="xdat:criteria_set" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:appinfo>
-						<xdat:field>
-							<xdat:relation relationType="single"/>
-						</xdat:field>
-					</xs:appinfo>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-		<xs:attribute name="method" use="required">
-			<xs:simpleType>
-				<xs:restriction base="xs:string">
-					<xs:enumeration value="AND"/>
-					<xs:enumeration value="OR"/>
-				</xs:restriction>
-			</xs:simpleType>
-		</xs:attribute>
-	</xs:complexType>
-	<xs:complexType name="criteria">
-		<xs:annotation>
-			<xs:appinfo>
-				<xdat:element ignoreWarnings="true" displayIdentifiers="schema_field"/>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="schema_field" type="xs:string" minOccurs="0"/>
-			<xs:element name="comparison_type" type="xs:string" minOccurs="0"/>
-			<xs:element name="custom_search" type="xs:string" minOccurs="0"/>
-			<xs:element name="value" type="xs:string" minOccurs="0"/>
-		</xs:sequence>
-		<xs:attribute name="override_value_formatting" type="xs:boolean" use="optional" default="0"/>
-	</xs:complexType>
-	<xs:complexType name="search_field">
-		<xs:annotation>
-			<xs:appinfo>
-				<xdat:element ignoreWarnings="true" displayIdentifiers="field_ID"/>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="element_name" type="xs:string">
-				<xs:annotation>
-					<xs:appinfo>
-						<xdat:field uniqueComposite="true"/>
-					</xs:appinfo>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="field_ID" type="xs:string">
-				<xs:annotation>
-					<xs:appinfo>
-						<xdat:field uniqueComposite="true"/>
-					</xs:appinfo>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="sequence" type="xs:integer"/>
-			<xs:element name="type" type="xs:string"/>
-			<xs:element name="header" minOccurs="0"/>
-			<xs:element name="value" type="xs:string" minOccurs="0"/>
-		</xs:sequence>
-		<xs:attribute name="visible" type="xs:boolean" use="optional"/>
-	</xs:complexType>
-	<xs:element name="bundle" type="xdat:stored_search"/>
-	<xs:complexType name="access_log">
-		<xs:annotation>
-			<xs:appinfo>
-				<xdat:element ignoreWarnings="true"/>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="login" type="xs:string"/>
-			<xs:element name="access_date" type="xs:dateTime" minOccurs="0"/>
-			<xs:element name="ip" type="xs:string" minOccurs="0"/>
-			<xs:element name="method" minOccurs="0">
-				<xs:simpleType>
-					<xs:restriction base="xs:string">
-						<xs:enumeration value="report"/>
-						<xs:enumeration value="edit"/>
-						<xs:enumeration value="pdf"/>
-						<xs:enumeration value="xml"/>
-						<xs:enumeration value="transfer"/>
-						<xs:enumeration value="build"/>
-						<xs:enumeration value="activation"/>
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="userGroup">
-		<xs:annotation>
-			<xs:appinfo>
-				<xdat:element displayIdentifiers="ID"/>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element ref="xdat:element_access" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:appinfo>
-						<xdat:field>
-							<xdat:relation uniqueComposite="group_access" relationType="single"/>
-						</xdat:field>
-					</xs:appinfo>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-		<xs:attribute name="ID" type="xs:string">
-			<xs:annotation>
-				<xs:appinfo>
-					<xdat:field unique="true"/>
-				</xs:appinfo>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="displayName" type="xs:string"/>
-		<xs:attribute name="tag" type="xs:string"/>
-	</xs:complexType>
-	<xs:element name="UserGroup" type="xdat:userGroup"/>
-	<xs:element name="XDATUser" type="xdat:user"/>
-	<xs:element name="Search">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:extension base="xdat:stored_search">
-					<xs:attribute name="page" type="xs:integer" use="optional"/>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	<xs:complexType name="newsEntry">
-		<xs:sequence minOccurs="0">
-			<xs:element name="date" type="xs:dateTime" minOccurs="0"/>
-			<xs:element name="title" type="xs:string">
-				<xs:annotation>
-					<xs:appinfo>
-						<xdat:field unique="true"/>
-					</xs:appinfo>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="description" minOccurs="0">
-				<xs:simpleType>
-					<xs:restriction base="xs:string">
-						<xs:maxLength value="1000"/>
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:element>
-			<xs:element name="link" type="xs:string" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="infoEntry">
-		<xs:sequence minOccurs="0">
-			<xs:element name="date" type="xs:dateTime" minOccurs="0"/>
-			<xs:element name="title" type="xs:string">
-				<xs:annotation>
-					<xs:appinfo>
-						<xdat:field unique="true"/>
-					</xs:appinfo>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="description" minOccurs="0">
-				<xs:simpleType>
-					<xs:restriction base="xs:string">
-						<xs:maxLength value="1000"/>
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:element>
-			<xs:element name="link" type="xs:string" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="News" type="xdat:newsEntry"/>
-	<xs:element name="Info" type="xdat:infoEntry"/>
-</xs:schema>
diff --git a/src/main/webapp/schemas/validation/display/val_protocolData_display.xml b/src/main/webapp/schemas/validation/display/val_protocolData_display.xml
deleted file mode 100644
index d2566fb7..00000000
--- a/src/main/webapp/schemas/validation/display/val_protocolData_display.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="val:protocolData" full-description="ProtocolVal" brief-description="ProtocolVal">
-	<DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="val:protocolData.ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','val:protocolData','val:protocolData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="RPT" header="ID" visible="true" image="true">
-		<Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','val:protocolData','val:protocolData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="DATE" header="Date" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="val:protocolData.date"/>
-	</DisplayField>
-	<DisplayField header="Projects" id="PROJECTS" data-type="string">
-		<DisplayFieldElement name="Field1" viewName="VAL_PROTOCOLDATA_PROJECTS" viewColumn="PROJECTS"/>
-	</DisplayField>
-	<DisplayField header="Label" id="LABEL" data-type="string">
-	<DisplayFieldElement name="Field1" schema-element="val:protocolData.ID"/>
-	<DisplayFieldElement name="Field2" schema-element="val:protocolData.label"/>
-	<Content type="sql">COALESCE(@Field2, @Field1)</Content>
-		<HTML-Link>
-			<SecureLink elementName="val:protocolData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="val:protocolData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="val:protocolData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/val:protocolData/search_field/val:protocolData.ID">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="ONCLICK" value="return rpt('@Field1','val:protocolData','val:protocolData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="TITLE" value="Inserted: @Field1 (@Field2)">
-				<InsertValue id="Field1" field="INSERT_DATE"/>
-				<InsertValue id="Field2" field="INSERT_USER"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="val:protocolData.project"/>
-	</DisplayField>
-	<DisplayField id="VAL_PROTOCOLDATA_PROJECT_IDENTIFIER" header="VAL_PROTOCOLDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">val_protocoldata_project_id</Content>
-		<HTML-Link>
-			<SecureLink elementName="val:protocolData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="val:protocolData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="val:protocolData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/val:protocolData/search_field/val:protocolData.ID/project/@Field2">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-				<InsertValue id="Field2" field="@WHERE"/>
-			</Property>
-		</HTML-Link>
-		<SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS val_protocoldata_project_id,sharing_share_xnat_experimentda_id FROM (	SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE'	UNION 	SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="val:protocolData.ID" queryField="sharing_share_xnat_experimentda_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="val:protocolData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="val:protocolData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayField id="VAL_PROTOCOLDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">field</Content>
-		<SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='val:protocolData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="val:protocolData.ID" queryField="expt_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayField id="CHECK_STATUS" header="status" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="val:protocolData/check/status"/>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="ProtocolVal" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="RPT"/>
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="CHECK_STATUS"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="ProtocolVal" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="CHECK_STATUS"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="ProtocolVal" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="EXPT_ID"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="CHECK_STATUS"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="ProtocolVal" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="EXPT_ID"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="CHECK_STATUS"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="ProtocolVal" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="VAL_PROTOCOLDATA_PROJECT_IDENTIFIER"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="CHECK_STATUS"/>
-	</DisplayVersion>
-	<ViewLink alias="VAL_PROTOCOLDATA_PROJECTS">
-		<Mapping TableName="VAL_PROTOCOLDATA_PROJECTS">
-			<MappingColumn rootElement="val:protocolData" fieldElement="val:protocolData.ID" mapsTo="id"/>
-		</Mapping>
-	</ViewLink>
-	<SQLView name="VAL_PROTOCOLDATA_PROJECTS" sql="SELECT id, '&lt;' || expt.project || '&gt;' || xs_a_concat(',&lt;' || shared.project || '&gt;') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='val:protocolData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/validation/protocolValidation.xsd b/src/main/webapp/schemas/validation/protocolValidation.xsd
deleted file mode 100644
index f05035dd..00000000
--- a/src/main/webapp/schemas/validation/protocolValidation.xsd
+++ /dev/null
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSpy v2010 rel. 3 sp1 (http://www.altova.com) by Mohana Ramaratnam (NRG INDIA) -->
-<!-- edited with XMLSPY v2004 rel. 3 U (http://www.xmlspy.com) by Mohana Ramaratnam (Washington University) -->
-<xs:schema targetNamespace="http://nrg.wustl.edu/val" xmlns:xdat="http://nrg.wustl.edu/xdat" xmlns:val="http://nrg.wustl.edu/val" xmlns:xnat="http://nrg.wustl.edu/xnat" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<xs:import namespace="http://nrg.wustl.edu/xnat" schemaLocation="../xnat/xnat.xsd"/>
-	<xs:complexType name="protocolData">
-		<xs:complexContent>
-			<xs:extension base="xnat:imageAssessorData">
-				<xs:sequence minOccurs="0">
-					<xs:element name="check" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence minOccurs="0">
-								<xs:element name="conditions" minOccurs="0">
-									<xs:complexType>
-										<xs:sequence minOccurs="0">
-											<xs:element name="condition" minOccurs="0" maxOccurs="unbounded">
-												<xs:annotation>
-													<xs:appinfo>
-														<xdat:field>
-															<xdat:relation uniqueComposite="SCAN_CHECK_ID"/>
-														</xdat:field>
-													</xs:appinfo>
-												</xs:annotation>
-												<xs:complexType>
-													<xs:sequence>
-														<xs:element name="verified" type="xs:string" minOccurs="0"/>
-														<xs:element name="diagnosis" minOccurs="0">
-															<xs:simpleType>
-																<xs:restriction base="xs:string">
-																	<xs:maxLength value="1000"/>
-																</xs:restriction>
-															</xs:simpleType>
-														</xs:element>
-													</xs:sequence>
-													<xs:attribute name="ID" type="xs:string">
-														<xs:annotation>
-															<xs:appinfo>
-																<xdat:field  uniqueComposite="SCAN_CHECK_ID"/>
-															</xs:appinfo>
-														</xs:annotation>
-													</xs:attribute>
-													<xs:attribute name="status" type="xs:string"/>
-													<xs:attribute name="xmlpath" type="xs:string"/>
-												</xs:complexType>
-											</xs:element>
-										</xs:sequence>
-									</xs:complexType>
-								</xs:element>
-								<xs:element name="comments" minOccurs="0">
-									<xs:complexType>
-										<xs:sequence minOccurs="0">
-											<xs:element name="comment" minOccurs="0" maxOccurs="unbounded">
-												<xs:annotation>
-													<xs:appinfo>
-														<xdat:field>
-															<xdat:relation uniqueComposite="SES_COMMENT_DATE"/>
-														</xdat:field>
-													</xs:appinfo>
-												</xs:annotation>
-												<xs:complexType>
-													<xs:simpleContent>
-														<xs:extension base="xs:string">
-															<xs:attribute name="username" type="xs:string"/>
-															<xs:attribute name="dateTime" type="xs:dateTime" use="required">
-																<xs:annotation>
-																	<xs:appinfo>
-																		<xdat:field uniqueComposite="SES_COMMENT_DATE"/>
-																	</xs:appinfo>
-																</xs:annotation>
-															</xs:attribute>
-														</xs:extension>
-													</xs:simpleContent>
-												</xs:complexType>
-											</xs:element>
-										</xs:sequence>
-									</xs:complexType>
-								</xs:element>
-								<xs:element name="additionalVal" type="val:additionalVal" minOccurs="0"/>
-							</xs:sequence>
-							<xs:attribute name="status" type="xs:string" use="required"/>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="scans" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence minOccurs="0">
-								<xs:element name="scan_check" minOccurs="0" maxOccurs="unbounded">
-									<xs:annotation>
-										<xs:appinfo>
-											<xdat:field>
-												<xdat:relation uniqueComposite="SCAN_ID"/>
-											</xdat:field>
-										</xs:appinfo>
-									</xs:annotation>
-									<xs:complexType>
-										<xs:sequence minOccurs="0">
-											<xs:element name="conditions" minOccurs="0">
-												<xs:complexType>
-													<xs:sequence minOccurs="0">
-														<xs:element name="condition" minOccurs="0" maxOccurs="unbounded">
-														<xs:annotation>
-															<xs:appinfo>
-																<xdat:field>
-																	<xdat:relation uniqueComposite="SCAN_CONDITION_ID"/>
-																</xdat:field>
-															</xs:appinfo>
-														</xs:annotation>
-															<xs:complexType>
-																<xs:sequence>
-																	<xs:element name="verified" type="xs:string" minOccurs="0"/>
-																	<xs:element name="diagnosis" minOccurs="0">
-																		<xs:simpleType>
-																			<xs:restriction base="xs:string">
-																				<xs:maxLength value="1000"/>
-																			</xs:restriction>
-																		</xs:simpleType>
-																	</xs:element>
-																</xs:sequence>
-																<xs:attribute name="ID" type="xs:string">
-																	<xs:annotation>
-																		<xs:appinfo>
-																			<xdat:field uniqueComposite="SCAN_CONDITION_ID"/>
-																		</xs:appinfo>
-																	</xs:annotation>
-																</xs:attribute>
-																<xs:attribute name="status" type="xs:string"/>
-																<xs:attribute name="xmlpath" type="xs:string"/>
-															</xs:complexType>
-														</xs:element>
-													</xs:sequence>
-												</xs:complexType>
-											</xs:element>
-											<xs:element name="comments" minOccurs="0">
-												<xs:complexType>
-													<xs:sequence minOccurs="0">
-														<xs:element name="comment" minOccurs="0" maxOccurs="unbounded">
-															<xs:annotation>
-																<xs:appinfo>
-																	<xdat:field>
-																		<xdat:relation uniqueComposite="SCAN_COMMENT_DATE"/>
-																	</xdat:field>
-																</xs:appinfo>
-															</xs:annotation>
-															<xs:complexType>
-																<xs:simpleContent>
-																	<xs:extension base="xs:string">
-																		<xs:attribute name="username" type="xs:string"/>
-																		<xs:attribute name="dateTime" type="xs:dateTime" use="required">
-																			<xs:annotation>
-																				<xs:appinfo>
-																					<xdat:field uniqueComposite="SCAN_COMMENT_DATE"/>
-																				</xs:appinfo>
-																			</xs:annotation>
-																		</xs:attribute>
-																	</xs:extension>
-																</xs:simpleContent>
-															</xs:complexType>
-														</xs:element>
-													</xs:sequence>
-												</xs:complexType>
-											</xs:element>
-											<xs:element name="additionalVal" type="val:additionalVal" minOccurs="0"/>
-										</xs:sequence>
-										<xs:attribute name="SCAN_ID" type="xs:string" use="required">
-											<xs:annotation>
-												<xs:appinfo>
-													<xdat:field uniqueComposite="SCAN_ID"/>
-												</xs:appinfo>
-											</xs:annotation>
-										</xs:attribute>
-										<xs:attribute name="status" type="xs:string" use="required"/>
-									</xs:complexType>
-								</xs:element>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:element name="ProtocolVal" type="val:protocolData"/>
-	<xs:complexType name="additionalVal"/>
-</xs:schema>
diff --git a/src/main/webapp/schemas/xdat/PlexiViewer.xsd b/src/main/webapp/schemas/xdat/PlexiViewer.xsd
deleted file mode 100644
index 7106c788..00000000
--- a/src/main/webapp/schemas/xdat/PlexiViewer.xsd
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v2004 rel. 3 U (http://www.xmlspy.com) by Mohana Ramaratnam (Washington University) -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<xs:complexType name="LayoutDescription">
-		<xs:sequence>
-			<xs:element name="Coordinates">
-				<xs:complexType>
-					<xs:attribute name="originX" type="xs:integer" use="required"/>
-					<xs:attribute name="originY" type="xs:integer" use="required"/>
-					<xs:attribute name="originZ" type="xs:integer" use="required"/>
-				</xs:complexType>
-			</xs:element>
-		</xs:sequence>
-		<xs:attribute name="name" type="xs:string" use="required"/>
-		<xs:attribute name="voxelSize" type="xs:integer" use="required"/>
-	</xs:complexType>
-	<xs:element name="Layout" type="LayoutDescription"/>
-	<xs:element name="CropDetails">
-		<xs:annotation>
-			<xs:documentation>The information here will be used by the plexiConverter to crop the image</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:attribute name="startSlice" type="xs:integer" use="optional"/>
-			<xs:attribute name="endSlice" type="xs:integer" use="optional"/>
-			<xs:attribute name="X" type="xs:integer" use="required"/>
-			<xs:attribute name="Y" type="xs:integer" use="required"/>
-			<xs:attribute name="width" type="xs:integer" use="required"/>
-			<xs:attribute name="height" type="xs:integer" use="required"/>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="MontageView">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="transverse">
-					<xs:complexType>
-						<xs:attribute name="start_slice" type="xs:int" use="required"/>
-						<xs:attribute name="end_slice" type="xs:int" use="required"/>
-						<xs:attribute name="slice_spacing" type="xs:int" use="required"/>
-					</xs:complexType>
-				</xs:element>
-				<xs:element name="sagittal">
-					<xs:complexType>
-						<xs:attribute name="start_slice" type="xs:int" use="required"/>
-						<xs:attribute name="end_slice" type="xs:int" use="required"/>
-						<xs:attribute name="slice_spacing" type="xs:int" use="required"/>
-					</xs:complexType>
-				</xs:element>
-				<xs:element name="coronal">
-					<xs:complexType>
-						<xs:attribute name="start_slice" type="xs:int" use="required"/>
-						<xs:attribute name="end_slice" type="xs:int" use="required"/>
-						<xs:attribute name="slice_spacing" type="xs:int" use="required"/>
-					</xs:complexType>
-				</xs:element>
-			</xs:sequence>
-			<xs:attribute name="scale" type="xs:float" use="optional" default="1"/>
-		</xs:complexType>
-	</xs:element>
-	<xs:complexType name="SchemaLinkType">
-		<xs:attribute name="element" type="xs:string" use="required"/>
-		<xs:attribute name="value" type="xs:string" use="optional"/>
-	</xs:complexType>
-	<xs:element name="Viewer">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="PlexiViewer" maxOccurs="unbounded">
-					<xs:complexType>
-						<xs:complexContent>
-							<xs:extension base="PlexiViewerType">
-								<xs:attribute name="sessionType" type="xs:string" use="required"/>
-							</xs:extension>
-						</xs:complexContent>
-					</xs:complexType>
-				</xs:element>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:complexType name="PlexiViewerType">
-		<xs:sequence>
-			<xs:element name="DefaultLoResType" type="xs:string"/>
-			<xs:element name="ThumbnailArchiveLocation" type="xs:string"/>
-			<xs:element name="LoResArchiveLocation" type="xs:string"/>
-			<xs:element name="CacheLocation" type="xs:string"/>
-			<xs:element ref="Layout" maxOccurs="unbounded"/>
-			<xs:element name="ViewableItem" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>A collection of images which are viewable. A reconstructed image for a scan may also be viewable. The attribute type will correspond to type/code for the scan/reconstructed image/assessor </xs:documentation>
-				</xs:annotation>
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="SchemaLink" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>Match the ELEMENT.FIELD to the viewable-Item.ID</xs:documentation>
-							</xs:annotation>
-							<xs:complexType>
-								<xs:complexContent>
-									<xs:extension base="SchemaLinkType"/>
-								</xs:complexContent>
-							</xs:complexType>
-						</xs:element>
-						<xs:element name="UserInterface">
-							<xs:complexType>
-								<xs:sequence>
-									<xs:element name="LinkedDropDown" minOccurs="0" maxOccurs="unbounded">
-										<xs:complexType>
-											<xs:attribute name="viewableItemType" type="xs:string" use="required"/>
-										</xs:complexType>
-									</xs:element>
-								</xs:sequence>
-								<xs:attribute name="selectionPriority" type="xs:int" use="optional"/>
-								<xs:attribute name="displayText" type="xs:string" use="optional"/>
-								<xs:attribute name="allowedToChooseFiles" type="xs:boolean" use="optional" default="false"/>
-								<xs:attribute name="allowedToChooseID" type="xs:boolean" use="optional" default="false"/>
-							</xs:complexType>
-						</xs:element>
-						<xs:element name="Thumbnail" minOccurs="0">
-							<xs:complexType>
-								<xs:sequence>
-									<xs:element ref="CropDetails" minOccurs="0"/>
-									<xs:element name="Slice" maxOccurs="unbounded">
-										<xs:complexType>
-											<xs:attribute name="number" type="xs:int" use="required"/>
-											<xs:attribute name="orientation" type="xs:string" use="required"/>
-										</xs:complexType>
-									</xs:element>
-								</xs:sequence>
-								<xs:attribute name="converterClassName" type="xs:string" use="required"/>
-								<xs:attribute name="format" type="xs:string" use="required"/>
-							</xs:complexType>
-						</xs:element>
-						<xs:element name="Lo-Res" minOccurs="0" maxOccurs="unbounded">
-							<xs:complexType>
-								<xs:sequence>
-									<xs:element ref="CropDetails" minOccurs="0"/>
-									<xs:element ref="MontageView"/>
-									<xs:element name="Parameter" minOccurs="0" maxOccurs="unbounded">
-										<xs:annotation>
-											<xs:documentation>Keep track of parameters that might have to be passed in order to convert. EG Dbar and Asigma images need a scaleFactor in order to convert into 8 bit.</xs:documentation>
-										</xs:annotation>
-										<xs:complexType>
-											<xs:attribute name="attribute" type="xs:string" use="required"/>
-											<xs:attribute name="value" type="xs:string" use="required"/>
-										</xs:complexType>
-									</xs:element>
-								</xs:sequence>
-								<xs:attribute name="type" type="xs:string" use="required"/>
-								<xs:attribute name="converterClassName" type="xs:string" use="required"/>
-								<xs:attribute name="format" type="xs:string" use="required"/>
-							</xs:complexType>
-						</xs:element>
-						<xs:element name="Hi-Res" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>The class (formatConverterClassName) will convert the Hi-Res image from one format to the other. Eg MPRAGE images are converted to 4dfp using imato4dfp</xs:documentation>
-							</xs:annotation>
-							<xs:complexType>
-								<xs:sequence>
-									<xs:element name="Layer" maxOccurs="unbounded">
-										<xs:annotation>
-											<xs:documentation>The attribute num will decide the layer on which the image gets inserted. For only one image/layer put only one entry. </xs:documentation>
-										</xs:annotation>
-										<xs:complexType>
-											<xs:complexContent>
-												<xs:extension base="SchemaLinkType">
-													<xs:attribute name="num" type="xs:int" use="required"/>
-												</xs:extension>
-											</xs:complexContent>
-										</xs:complexType>
-									</xs:element>
-									<xs:element name="LayoutRef">
-										<xs:complexType>
-											<xs:attribute name="name" type="xs:string" use="required"/>
-										</xs:complexType>
-									</xs:element>
-									<xs:element ref="MontageView"/>
-								</xs:sequence>
-								<xs:attribute name="formatConverterClass" type="xs:string" use="optional"/>
-								<xs:attribute name="format" type="xs:string" use="required"/>
-								<xs:attribute name="minIntensity" type="xs:float" use="optional"/>
-								<xs:attribute name="maxIntensity" type="xs:float" use="optional"/>
-							</xs:complexType>
-						</xs:element>
-					</xs:sequence>
-					<xs:attribute name="type" type="xs:string" use="required"/>
-					<xs:attribute name="imageViewerClassName" type="xs:string" use="optional"/>
-					<xs:attribute name="displayCondition" type="xs:string"/>
-				</xs:complexType>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-</xs:schema>
diff --git a/src/main/webapp/schemas/xdat/display.xsd b/src/main/webapp/schemas/xdat/display.xsd
deleted file mode 100644
index 136d8f44..00000000
--- a/src/main/webapp/schemas/xdat/display.xsd
+++ /dev/null
@@ -1,322 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v2004 rel. 3 U (http://www.xmlspy.com) by Tim Olsen (Washington University) -->
-<xs:schema targetNamespace="http://nrg.wustl.edu/display" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:display="http://nrg.wustl.edu/display" elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<xs:element name="Displays">
-		<xs:annotation>
-			<xs:documentation>Comment describing your root element</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="display:Arc-Definition" minOccurs="0" maxOccurs="unbounded"/>
-				<xs:element ref="display:Arc" minOccurs="0" maxOccurs="unbounded"/>
-				<xs:element name="DisplayField" maxOccurs="unbounded">
-					<xs:complexType>
-						<xs:complexContent>
-							<xs:extension base="display:FieldType">
-								<xs:attribute name="html-content" use="optional">
-									<xs:simpleType>
-										<xs:restriction base="xs:string">
-											<xs:enumeration value="true"/>
-											<xs:enumeration value="false"/>
-										</xs:restriction>
-									</xs:simpleType>
-								</xs:attribute>
-								<xs:attribute name="visible" type="xs:boolean"/>
-							</xs:extension>
-						</xs:complexContent>
-					</xs:complexType>
-				</xs:element>
-				<xs:element name="DisplayVersion" maxOccurs="unbounded">
-					<xs:complexType>
-						<xs:sequence>
-							<xs:element name="HTML-Header" type="display:HTML-Cell" minOccurs="0"/>
-							<xs:element name="DisplayFieldRef" maxOccurs="unbounded">
-								<xs:complexType>
-									<xs:attribute name="id" type="xs:string" use="required"/>
-									<xs:attribute name="header" type="xs:string" use="optional"/>
-									<xs:attribute name="element_name" type="xs:string" use="optional"/>
-									<xs:attribute name="type" use="optional">
-										<xs:simpleType>
-											<xs:restriction base="xs:string">
-												<xs:enumeration value="COUNT"/>
-											</xs:restriction>
-										</xs:simpleType>
-									</xs:attribute>
-									<xs:attribute name="value" type="xs:string" use="optional"/>
-									<xs:attribute name="visible" type="xs:boolean" use="optional"/>
-								</xs:complexType>
-							</xs:element>
-						</xs:sequence>
-						<xs:attribute name="versionName" type="xs:string" use="required"/>
-						<xs:attribute name="default-order-by" type="xs:string" use="required"/>
-						<xs:attribute name="brief-description" type="xs:string"/>
-						<xs:attribute name="dark-color" type="xs:string"/>
-						<xs:attribute name="light-color" type="xs:string"/>
-						<xs:attribute name="default-sort-order" type="xs:string"/>
-						<xs:attribute name="allow-diff-columns" type="xs:boolean"/>
-					</xs:complexType>
-				</xs:element>
-				<xs:element name="SchemaLink" minOccurs="0" maxOccurs="unbounded">
-					<xs:complexType>
-						<xs:sequence>
-							<xs:element ref="display:Mapping" minOccurs="0"/>
-						</xs:sequence>
-						<xs:attribute name="element" type="xs:string" use="required"/>
-						<xs:attribute name="type">
-							<xs:simpleType>
-								<xs:restriction base="xs:string">
-									<xs:enumeration value="mapping"/>
-								</xs:restriction>
-							</xs:simpleType>
-						</xs:attribute>
-						<xs:attribute name="alias" type="xs:string" use="required"/>
-					</xs:complexType>
-				</xs:element>
-				<xs:element name="ViewLink" minOccurs="0" maxOccurs="unbounded">
-					<xs:complexType>
-						<xs:sequence>
-							<xs:element ref="display:Mapping"/>
-						</xs:sequence>
-						<xs:attribute name="alias" type="xs:string" use="required"/>
-					</xs:complexType>
-				</xs:element>
-				<xs:element name="SQLView" minOccurs="0" maxOccurs="unbounded">
-					<xs:complexType>
-						<xs:attribute name="name" type="xs:string" use="required"/>
-						<xs:attribute name="sql" type="xs:string" use="required"/>
-					</xs:complexType>
-				</xs:element>
-				<xs:element name="SQLFunction" minOccurs="0" maxOccurs="unbounded">
-					<xs:complexType>
-						<xs:attribute name="name" type="xs:string"/>
-						<xs:attribute name="content" type="xs:string"/>
-					</xs:complexType>
-				</xs:element>
-			</xs:sequence>
-			<xs:attribute name="schema-element" type="xs:string"/>
-			<xs:attribute name="HTML-header-link" type="xs:string"/>
-			<xs:attribute name="value_field" type="xs:string" use="optional"/>
-			<xs:attribute name="display_field" type="xs:string" use="optional"/>
-			<xs:attribute name="display_label" type="xs:string" use="optional"/>
-			<xs:attribute name="brief-description" type="xs:string"/>
-			<xs:attribute name="full-description" type="xs:string"/>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="Mapping">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="MappingColumn" maxOccurs="unbounded">
-					<xs:complexType>
-						<xs:attribute name="rootElement" type="xs:string"/>
-						<xs:attribute name="fieldElement"/>
-						<xs:attribute name="mapsTo" type="xs:string"/>
-					</xs:complexType>
-				</xs:element>
-			</xs:sequence>
-			<xs:attribute name="TableName" type="xs:string"/>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="DisplayFieldElement">
-		<xs:complexType>
-			<xs:attribute name="name" type="xs:string" use="required"/>
-			<xs:attribute name="schema-element" type="xs:string" use="optional"/>
-			<xs:attribute name="viewName" type="xs:string"/>
-			<xs:attribute name="viewColumn" type="xs:string"/>
-			<xs:attribute name="xdat-type">
-				<xs:simpleType>
-					<xs:restriction base="xs:string">
-						<xs:enumeration value="COUNT"/>
-						<xs:enumeration value="WHERE"/>
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:attribute>
-		</xs:complexType>
-	</xs:element>
-	<xs:complexType name="HTML-Cell">
-		<xs:attribute name="width" type="xs:integer"/>
-		<xs:attribute name="height" type="xs:integer"/>
-		<xs:attribute name="valign">
-			<xs:simpleType>
-				<xs:restriction base="xs:string">
-					<xs:enumeration value="bottom"/>
-					<xs:enumeration value="top"/>
-				</xs:restriction>
-			</xs:simpleType>
-		</xs:attribute>
-		<xs:attribute name="align">
-			<xs:simpleType>
-				<xs:restriction base="xs:string">
-					<xs:enumeration value="left"/>
-					<xs:enumeration value="right"/>
-					<xs:enumeration value="center"/>
-				</xs:restriction>
-			</xs:simpleType>
-		</xs:attribute>
-		<xs:attribute name="serverLink" type="xs:string"/>
-	</xs:complexType>
-	<xs:element name="Arc-Definition">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="CommonField" maxOccurs="unbounded">
-					<xs:complexType>
-						<xs:attribute name="id" type="xs:string" use="required"/>
-						<xs:attribute name="type" use="required">
-							<xs:simpleType>
-								<xs:restriction base="xs:string">
-									<xs:enumeration value="DATE"/>
-									<xs:enumeration value="INTEGER"/>
-									<xs:enumeration value="STRING"/>
-								</xs:restriction>
-							</xs:simpleType>
-						</xs:attribute>
-					</xs:complexType>
-				</xs:element>
-				<xs:element name="Bridge-Element">
-					<xs:complexType>
-						<xs:attribute name="name" type="xs:string" use="required"/>
-						<xs:attribute name="field" type="xs:string" use="required"/>
-					</xs:complexType>
-				</xs:element>
-				<xs:element name="Filter" maxOccurs="unbounded">
-					<xs:complexType>
-						<xs:attribute name="field" type="xs:string" use="required"/>
-						<xs:attribute name="filterType" use="required">
-							<xs:simpleType>
-								<xs:restriction base="xs:string">
-									<xs:enumeration value="closest"/>
-									<xs:enumeration value="before"/>
-									<xs:enumeration value="equals"/>
-									<xs:enumeration value="distinct"/>
-								</xs:restriction>
-							</xs:simpleType>
-						</xs:attribute>
-					</xs:complexType>
-				</xs:element>
-			</xs:sequence>
-			<xs:attribute name="Id" type="xs:string" use="required"/>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="Arc">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="CommonField" maxOccurs="unbounded">
-					<xs:complexType>
-						<xs:attribute name="id" type="xs:string" use="required"/>
-						<xs:attribute name="local-field" type="xs:string" use="required"/>
-					</xs:complexType>
-				</xs:element>
-			</xs:sequence>
-			<xs:attribute name="name" type="xs:string" use="required"/>
-		</xs:complexType>
-	</xs:element>
-	<xs:complexType name="FieldType">
-		<xs:sequence>
-			<xs:element ref="display:DisplayFieldElement" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Content" minOccurs="0">
-				<xs:complexType>
-					<xs:simpleContent>
-						<xs:extension base="xs:string">
-							<xs:attribute name="type">
-								<xs:simpleType>
-									<xs:restriction base="xs:string">
-										<xs:enumeration value="sql"/>
-										<xs:enumeration value="java"/>
-									</xs:restriction>
-								</xs:simpleType>
-							</xs:attribute>
-						</xs:extension>
-					</xs:simpleContent>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="HTML-Link" minOccurs="0">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="SecureLink" minOccurs="0">
-							<xs:complexType>
-								<xs:sequence>
-									<xs:element name="securityMappingValue" maxOccurs="unbounded">
-										<xs:complexType>
-											<xs:attribute name="displayFieldId" type="xs:string" use="required"/>
-											<xs:attribute name="schemaElementMap" type="xs:string" use="required"/>
-										</xs:complexType>
-									</xs:element>
-								</xs:sequence>
-								<xs:attribute name="elementName" type="xs:string" use="required"/>
-							</xs:complexType>
-						</xs:element>
-						<xs:element name="Property" maxOccurs="unbounded">
-							<xs:complexType>
-								<xs:sequence>
-									<xs:element name="InsertValue" minOccurs="0" maxOccurs="unbounded">
-										<xs:complexType>
-											<xs:attribute name="id"/>
-											<xs:attribute name="field"/>
-										</xs:complexType>
-									</xs:element>
-								</xs:sequence>
-								<xs:attribute name="name">
-									<xs:simpleType>
-										<xs:restriction base="xs:string"/>
-									</xs:simpleType>
-								</xs:attribute>
-								<xs:attribute name="value"/>
-							</xs:complexType>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="HTML-Cell" type="display:HTML-Cell" minOccurs="0"/>
-			<xs:element name="HTML-Image" minOccurs="0">
-				<xs:complexType>
-					<xs:attribute name="width" type="xs:integer"/>
-					<xs:attribute name="height" type="xs:integer"/>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="description" type="xs:string" minOccurs="0"/>
-		</xs:sequence>
-		<xs:attribute name="header" type="xs:string" use="required"/>
-		<xs:attribute name="id" type="xs:string" use="required"/>
-		<xs:attribute name="image" type="xs:boolean" default="false"/>
-		<xs:attribute name="sort-by"/>
-		<xs:attribute name="sort-order">
-			<xs:simpleType>
-				<xs:restriction base="xs:string">
-					<xs:enumeration value="ASC"/>
-					<xs:enumeration value="DESC"/>
-				</xs:restriction>
-			</xs:simpleType>
-		</xs:attribute>
-		<xs:attribute name="searchable" type="xs:boolean"/>
-		<xs:attribute name="data-type">
-			<xs:simpleType>
-				<xs:restriction base="xs:string">
-					<xs:enumeration value="integer"/>
-					<xs:enumeration value="string"/>
-					<xs:enumeration value="float"/>
-					<xs:enumeration value="date"/>
-				</xs:restriction>
-			</xs:simpleType>
-		</xs:attribute>
-	</xs:complexType>
-	<xs:complexType name="SubQueryField">
-		<xs:complexContent>
-			<xs:extension base="display:FieldType">
-				<xs:sequence minOccurs="0">
-					<xs:element name="SubQuery" type="xs:string" minOccurs="0"/>
-					<xs:element name="MappingColumns" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence minOccurs="0">
-								<xs:element name="MappingColumn" minOccurs="0" maxOccurs="unbounded">
-									<xs:complexType>
-										<xs:attribute name="schemaField" type="xs:string"/>
-										<xs:attribute name="queryField" type="xs:string"/>
-									</xs:complexType>
-								</xs:element>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-</xs:schema>
diff --git a/src/main/webapp/schemas/xdat/instance.xsd b/src/main/webapp/schemas/xdat/instance.xsd
deleted file mode 100644
index 7ef2e2e6..00000000
--- a/src/main/webapp/schemas/xdat/instance.xsd
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v2004 rel. 3 U (http://www.xmlspy.com) by Tim Olsen (Washington University) -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<xs:element name="Instance_Settings">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="Databases">
-					<xs:complexType>
-						<xs:sequence>
-							<xs:element name="Database">
-								<xs:complexType>
-									<xs:attribute name="Type">
-										<xs:simpleType>
-											<xs:restriction base="xs:string">
-												<xs:enumeration value="POSTGRESQL"/>
-												<xs:enumeration value="MYSQL"/>
-											</xs:restriction>
-										</xs:simpleType>
-									</xs:attribute>
-									<xs:attribute name="Id" type="xs:string"/>
-									<xs:attribute name="Url" type="xs:string"/>
-									<xs:attribute name="User" type="xs:string"/>
-									<xs:attribute name="Pass" type="xs:string"/>
-									<xs:attribute name="Driver" type="xs:string"/>
-									<xs:attribute name="MaxConnections" type="xs:integer"/>
-								</xs:complexType>
-							</xs:element>
-						</xs:sequence>
-					</xs:complexType>
-				</xs:element>
-				<xs:element name="Package" minOccurs="0">
-					<xs:complexType>
-						<xs:attribute name="Name" type="xs:string"/>
-					</xs:complexType>
-				</xs:element>
-				<xs:element name="Models">
-					<xs:complexType>
-						<xs:sequence>
-							<xs:element name="Data_Model" maxOccurs="unbounded">
-								<xs:complexType>
-									<xs:attribute name="File_Name" type="xs:string"/>
-									<xs:attribute name="File_Location" type="xs:string"/>
-									<xs:attribute name="DB" type="xs:string"/>
-									<xs:attribute name="package" type="xs:string" use="optional"/>
-								</xs:complexType>
-							</xs:element>
-						</xs:sequence>
-					</xs:complexType>
-				</xs:element>
-				<xs:element name="Data_Type_Codes" minOccurs="0">
-					<xs:complexType>
-						<xs:sequence>
-							<xs:element name="Type_Code_Mapping" maxOccurs="unbounded">
-								<xs:complexType>
-									<xs:attribute name="Model_Id" type="xs:string"/>
-									<xs:attribute name="Model_Element" type="xs:string"/>
-									<xs:attribute name="Code" type="xs:string"/>
-									<xs:attribute name="Brief_Description" type="xs:string"/>
-									<xs:attribute name="Full_Description" type="xs:string"/>
-									<xs:attribute name="Log_Location" type="xs:string"/>
-								</xs:complexType>
-							</xs:element>
-						</xs:sequence>
-					</xs:complexType>
-				</xs:element>
-				<xs:element name="Pivots" minOccurs="0">
-					<xs:complexType>
-						<xs:sequence>
-							<xs:element name="Pivot" maxOccurs="unbounded">
-								<xs:complexType>
-									<xs:attribute name="Model_Id" type="xs:string"/>
-									<xs:attribute name="Model_Element" type="xs:string"/>
-									<xs:attribute name="Mapping1" type="xs:string"/>
-									<xs:attribute name="Mapping2" type="xs:string"/>
-								</xs:complexType>
-							</xs:element>
-						</xs:sequence>
-					</xs:complexType>
-				</xs:element>
-			</xs:sequence>
-			<xs:attribute name="admin_email" type="xs:string"/>
-			<xs:attribute name="smtp_server" type="xs:string" use="optional"/>
-			<xs:attribute name="archive_root_path" type="xs:string" use="optional"/>
-			<xs:attribute name="cache_path" type="xs:string" use="optional"/>
-			<xs:attribute name="prearchive_path" type="xs:string" use="optional"/>
-			<xs:attribute name="site_url" type="xs:string" use="optional"/>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/src/main/webapp/schemas/xdat/xdat.xsd b/src/main/webapp/schemas/xdat/xdat.xsd
deleted file mode 100644
index ec113fd2..00000000
--- a/src/main/webapp/schemas/xdat/xdat.xsd
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v2004 rel. 3 U (http://www.xmlspy.com) by Tim Olsen (Washington University) -->
-<xs:schema targetNamespace="http://nrg.wustl.edu/xdat" xmlns="http://nrg.wustl.edu/xdat" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<xs:element name="rule">
-		<xs:complexType>
-			<xs:attribute name="name" use="required">
-				<xs:simpleType>
-					<xs:restriction base="xs:string">
-						<xs:enumeration value="required"/>
-						<xs:enumeration value="minLength"/>
-						<xs:enumeration value="maxLength"/>
-						<xs:enumeration value="mask"/>
-						<xs:enumeration value="notANumberMessage"/>
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:attribute>
-			<xs:attribute name="value" type="xs:string" use="required"/>
-			<xs:attribute name="message" type="xs:string" use="required"/>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="sqlField">
-		<xs:complexType>
-			<xs:attribute name="name" type="xs:string" use="optional"/>
-			<xs:attribute name="primaryKey" use="optional" default="false">
-				<xs:simpleType>
-					<xs:restriction base="xs:string">
-						<xs:enumeration value="true"/>
-						<xs:enumeration value="false"/>
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:attribute>
-			<xs:attribute name="type" use="optional" default="VARCHAR">
-				<xs:simpleType>
-					<xs:restriction base="xs:string">
-						<xs:enumeration value="BIT"/>
-						<xs:enumeration value="TINYINT"/>
-						<xs:enumeration value="SMALLINT"/>
-						<xs:enumeration value="INTEGER"/>
-						<xs:enumeration value="BIGINT"/>
-						<xs:enumeration value="FLOAT"/>
-						<xs:enumeration value="REAL"/>
-						<xs:enumeration value="NUMERIC"/>
-						<xs:enumeration value="DECIMAL"/>
-						<xs:enumeration value="CHAR"/>
-						<xs:enumeration value="VARCHAR"/>
-						<xs:enumeration value="LONGVARCHAR"/>
-						<xs:enumeration value="DATE"/>
-						<xs:enumeration value="TIME"/>
-						<xs:enumeration value="TIMESTAMP"/>
-						<xs:enumeration value="BINARY"/>
-						<xs:enumeration value="VARBINARY"/>
-						<xs:enumeration value="LONGVARBINARY"/>
-						<xs:enumeration value="NULL"/>
-						<xs:enumeration value="OTHER"/>
-						<xs:enumeration value="JAVA_OBJECT"/>
-						<xs:enumeration value="DISTINCT"/>
-						<xs:enumeration value="STRUCT"/>
-						<xs:enumeration value="ARRAY"/>
-						<xs:enumeration value="BLOB"/>
-						<xs:enumeration value="CLOB"/>
-						<xs:enumeration value="REF"/>
-						<xs:enumeration value="BOOLEANINT"/>
-						<xs:enumeration value="BOOLEANCHAR"/>
-						<xs:enumeration value="DOUBLE"/>
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:attribute>
-			<xs:attribute name="autoIncrement" use="optional" default="false">
-				<xs:simpleType>
-					<xs:restriction base="xs:string">
-						<xs:enumeration value="true"/>
-						<xs:enumeration value="false"/>
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:attribute>
-			<xs:attribute name="index" type="xs:string" use="optional"/>
-			<xs:attribute name="key" use="optional">
-				<xs:simpleType>
-					<xs:restriction base="xs:string">
-						<xs:enumeration value="true"/>
-						<xs:enumeration value="false"/>
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:attribute>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="relation">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="duplicateRelationship" minOccurs="0" maxOccurs="unbounded">
-					<xs:complexType>
-						<xs:sequence>
-							<xs:element name="FieldMapping" maxOccurs="unbounded">
-								<xs:complexType>
-									<xs:attribute name="localField" type="xs:string" use="required"/>
-									<xs:attribute name="foreignField" type="xs:string"/>
-								</xs:complexType>
-							</xs:element>
-						</xs:sequence>
-						<xs:attribute name="elementName" type="xs:string"/>
-						<xs:attribute name="id" type="xs:string"/>
-						<xs:attribute name="foreignField" type="xs:string"/>
-						<xs:attribute name="localField" type="xs:string"/>
-					</xs:complexType>
-				</xs:element>
-			</xs:sequence>
-			<xs:attribute name="foreignKeyName" type="xs:string" use="optional"/>
-			<xs:attribute name="foreignKeyTable" type="xs:string" use="optional"/>
-			<xs:attribute name="foreignCol" type="xs:string" use="optional"/>
-			<xs:attribute name="onDelete" use="optional" default="none">
-				<xs:simpleType>
-					<xs:restriction base="xs:string">
-						<xs:enumeration value="cascade"/>
-						<xs:enumeration value="setnull"/>
-						<xs:enumeration value="restrict"/>
-						<xs:enumeration value="none"/>
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:attribute>
-			<xs:attribute name="onUpdate" use="optional" default="none">
-				<xs:simpleType>
-					<xs:restriction base="xs:string">
-						<xs:enumeration value="cascade"/>
-						<xs:enumeration value="setnull"/>
-						<xs:enumeration value="restrict"/>
-						<xs:enumeration value="none"/>
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:attribute>
-			<xs:attribute name="relationType" type="xs:string" use="optional"/>
-			<xs:attribute name="uniqueComposite" type="xs:string" use="optional"/>
-			<xs:attribute name="relationName" type="xs:string" use="optional"/>
-			<xs:attribute name="unique" type="xs:boolean" use="optional"/>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="field">
-		<xs:complexType>
-			<xs:all>
-				<xs:element ref="sqlField" minOccurs="0"/>
-				<xs:element ref="relation" minOccurs="0"/>
-				<xs:element ref="rule" minOccurs="0"/>
-			</xs:all>
-			<xs:attribute name="displayName" type="xs:string" use="optional"/>
-			<xs:attribute name="size" type="xs:int" use="optional"/>
-			<xs:attribute name="expose" use="optional">
-				<xs:simpleType>
-					<xs:restriction base="xs:string">
-						<xs:enumeration value="single"/>
-						<xs:enumeration value="false"/>
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:attribute>
-			<xs:attribute name="unique" use="optional">
-				<xs:simpleType>
-					<xs:restriction base="xs:string">
-						<xs:enumeration value="true"/>
-						<xs:enumeration value="false"/>
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:attribute>
-			<xs:attribute name="uniqueComposite" use="optional">
-				<xs:simpleType>
-					<xs:restriction base="xs:string"/>
-				</xs:simpleType>
-			</xs:attribute>
-			<xs:attribute name="xmlOnly" use="optional">
-				<xs:simpleType>
-					<xs:restriction base="xs:string">
-						<xs:enumeration value="true"/>
-						<xs:enumeration value="false"/>
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:attribute>
-			<xs:attribute name="baseElement" type="xs:string" use="optional"/>
-			<xs:attribute name="baseCol" type="xs:string" use="optional"/>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="sqlElement">
-		<xs:complexType>
-			<xs:attribute name="name" type="xs:string" use="optional"/>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="element">
-		<xs:complexType>
-			<xs:all>
-				<xs:element ref="sqlElement" minOccurs="0"/>
-			</xs:all>
-			<xs:attribute name="storeHistory" type="xs:boolean" use="optional"/>
-			<xs:attribute name="impliedRef" type="xs:string" use="optional"/>
-			<xs:attribute name="ignoreWarnings" type="xs:boolean"/>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="container">
-		<xs:complexType>
-			<xs:all>
-				<xs:element name="elements">
-					<xs:complexType>
-						<xs:sequence>
-							<xs:element ref="element" minOccurs="0" maxOccurs="unbounded"/>
-						</xs:sequence>
-					</xs:complexType>
-				</xs:element>
-				<xs:element name="fields">
-					<xs:complexType>
-						<xs:sequence>
-							<xs:element ref="field" minOccurs="0" maxOccurs="unbounded"/>
-						</xs:sequence>
-					</xs:complexType>
-				</xs:element>
-			</xs:all>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/src/main/webapp/schemas/xnat/display/mrSessionData_display.xml b/src/main/webapp/schemas/xnat/display/mrSessionData_display.xml
deleted file mode 100644
index 4ea27ca4..00000000
--- a/src/main/webapp/schemas/xnat/display/mrSessionData_display.xml
+++ /dev/null
@@ -1,365 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v2004 rel. 3 U (http://www.xmlspy.com) by Tim Olsen (Washington University) -->
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:mrSessionData" full-description="MR Session" brief-description="MR Session">
-	<Arc-Definition Id="ASSESSOR">
-		<CommonField id="EXPT_ID" type="STRING"/>
-		<CommonField id="ASSESSED_EXPT_ID" type="STRING"/>
-		<Bridge-Element name="xnat:mrSessionData" field="SESSION_ID"/>
-		<Filter field="EXPT_ID" filterType="distinct"/>
-		<Filter field="ASSESSED_EXPT_ID" filterType="equals"/>
-	</Arc-Definition>
-	<Arc name="PARTICIPANT_EXPERIMENT">
-		<CommonField id="PART_ID" local-field="SUBJECT_ID"/>
-		<CommonField id="DATE" local-field="DATE"/>
-		<CommonField id="EXPT_ID" local-field="SESSION_ID"/>
-	</Arc>
-	<DisplayField id="SESSION_ID" header="Session" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrSessionData.ID"/>
-		<HTML-Link>
-			<SecureLink elementName="xnat:mrSessionData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:mrSessionData/sharing/share/project"/>
-			</SecureLink>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:mrSessionData','xnat:mrSessionData.ID');">
-				<InsertValue id="Field1" field="SESSION_ID"/>
-			</Property>
-		</HTML-Link>
-		<description>MR Session Accession Number</description>
-	</DisplayField>
-	<DisplayField id="VIEW" header="" visible="true" image="true">
-		<Content type="sql">'/@WEBAPP/images/v.gif'::text</Content>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return viewer('@Field1');">
-				<InsertValue id="Field1" field="SESSION_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="SUBJECT_ID" header="Subject" visible="false" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrSessionData.subject_ID"/>
-		<description>Subject Accession Number</description>
-	</DisplayField>
-	<DisplayField id="SUBJECT_LABEL" header="Subject Label" data-type="String" searchable="true">
-		<DisplayFieldElement name="Field1" viewName="SUBJECT_LABEL" viewColumn="SUBJECT_LABEL"/>
-	</DisplayField>
-	<DisplayField id="RPT" header="" visible="true" image="true">
-		<Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:mrSessionData','xnat:mrSessionData.ID');">
-				<InsertValue id="Field1" field="SESSION_ID"/>
-			</Property>
-			<Property name="TITLE" value="Inserted: @Field1 (@Field2)">
-				<InsertValue id="Field1" field="INSERT_DATE"/>
-				<InsertValue id="Field2" field="INSERT_USER"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="DATE" header="Date" visible="true" searchable="true" data-type="date" sort-order="DESC">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrSessionData.date"/>
-		<description>MR Session Date (DATE)</description>
-	</DisplayField>
-	<DisplayField id="DATE_CHAR" header="Date" visible="true" sort-by="DATE" sort-order="DESC">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrSessionData.date"/>
-		<Content type="sql">CAST(@Field1 AS VARCHAR)</Content>
-		<description>MR Session Date (String)</description>
-	</DisplayField>
-	<DisplayField id="INVEST_SEARCH" header="PI" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrSessionData.investigator.firstname"/>
-		<DisplayFieldElement name="Field2" schema-element="xnat:mrSessionData.investigator.lastname"/>
-		<Content type="sql">@Field1 || ' ' || @Field2</Content>
-		<description>Primary Investigator (first and last name)</description>
-	</DisplayField>
-	<DisplayField id="INVEST" header="PI" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrSessionData.investigator.lastname"/>
-		<description>Primary Investigator (last name)</description>
-	</DisplayField>
-	<DisplayField id="INVEST_ID" header="PI" visible="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrSessionData.investigator.xnat_investigatorData_id"/>
-	</DisplayField>
-	<DisplayField id="INVEST_CSV" header="PI" visible="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrSessionData.investigator.lastname"/>
-	</DisplayField>
-	<DisplayField id="MR_NOTES" header="Notes" visible="true" data-type="string">
-		<DisplayFieldElement name="COL1" schema-element="xnat:mrSessionData.note"/>
-		<Content type="sql">substring(@COL1 FROM 0 FOR 10)</Content>
-	</DisplayField>
-	<DisplayField id="MR_NOTES_CSV" header="Notes" visible="true" data-type="string">
-		<DisplayFieldElement name="COL1" schema-element="xnat:mrSessionData.note"/>
-		<Content type="sql">@COL1</Content>
-	</DisplayField>
-	<DisplayField id="OPERATOR" header="Operator" visible="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrSessionData.operator"/>
-		<Content type="sql">substring(@Field1 FROM 0 FOR 6)</Content>
-	</DisplayField>
-	<DisplayField id="TYPE" header="Type" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrSessionData.session_type"/>
-	</DisplayField>
-	<DisplayField id="SCANNER" header="Scanner" visible="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrSessionData.scanner"/>
-	</DisplayField>
-	<DisplayField id="MARKER" header="Marker" visible="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrSessionData.marker"/>
-		<Content type="sql">substring(@Field1 FROM 0 FOR 6)</Content>
-	</DisplayField>
-	<DisplayField id="STABILIZATION" header="Stabilization" visible="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrSessionData.stabilization"/>
-		<Content type="sql">substring(@Field1 FROM 0 FOR 6)</Content>
-	</DisplayField>
-	<DisplayField id="OPERATOR_CSV" header="Operator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrSessionData.operator"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_CSV" header="Scanner" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrSessionData.scanner"/>
-	</DisplayField>
-	<DisplayField id="MARKER_CSV" header="Marker" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrSessionData.marker"/>
-	</DisplayField>
-	<DisplayField id="STABILIZATION_CSV" header="Stabilization" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrSessionData.stabilization"/>
-	</DisplayField>
-	<DisplayField id="GEN_AGE" header="Age" visible="true" searchable="true" data-type="float">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrSessionData.date"/>
-		<DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
-		<DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
-		<DisplayFieldElement name="Field4" schema-element="xnat:mrSessionData.age"/>
-		<Content type="sql">CAST(ROUND(CAST(COALESCE(@Field4,EXTRACT(YEAR FROM AGE(@Field1, @Field2)),(EXTRACT(YEAR FROM @Field1)) - (@Field3)) AS numeric),2) AS numeric)</Content>
-	</DisplayField>
-	<DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="float">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrSessionData.date"/>
-		<DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
-		<DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
-		<DisplayFieldElement name="Field5" schema-element="xnat:demographicData.age"/>
-		<DisplayFieldElement name="Field4" schema-element="xnat:mrSessionData.age"/>
-		<Content type="sql">CAST(FLOOR(CAST(COALESCE(@Field4,@Field5,EXTRACT(YEAR FROM AGE(@Field1, @Field2)),(EXTRACT(YEAR FROM @Field1)) - (@Field3)) AS numeric)) AS numeric)</Content>
-	</DisplayField>
-	<DisplayField header="DTI Count" id="DTI_COUNT" data-type="integer" searchable="true">
-		<DisplayFieldElement name="Field1" viewName="DTI_COUNT" viewColumn="DTI_COUNT"/>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="date">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrSessionData.meta.insert_date"/>
-	<description>Date session was archived</description>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrSessionData.meta.insert_user.login"/>
-	<description>User who archived session</description>
-	</DisplayField>
-	<DisplayField id="LAST_MODIFIED" header="Modified" visible="true" searchable="true" data-type="date">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrSessionData.meta.insert_date"/>
-		<DisplayFieldElement name="Field2" schema-element="xnat:mrSessionData.meta.last_modified"/>
-		<Content type="sql">COALESCE(@Field2, @Field1)</Content>
-	</DisplayField>
-	<DisplayField id="MR_SCAN_COUNT_AGG" header="Scans" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" viewName="MR_SCAN_COUNT_AGG" viewColumn="TYPE_COUNT"/>
-	<description>Aggregated Scan Counts</description>
-	</DisplayField>
-	<DisplayField id="WORKFLOW_STATUS" header="Process">
-		<DisplayFieldElement name="Field1" viewName="ORDERED_WORKFLOWS" viewColumn="STATUS"/>
-		<DisplayFieldElement name="Field2" viewName="ORDERED_WORKFLOWS" viewColumn="PIPELINE_NAME"/>
-		<Content type="sql">'&lt;B&gt;' || CASE @Field1 WHEN 'Complete' THEN '&lt;FONT COLOR=green&gt;' || @Field2 || '&lt;/FONT&gt;' WHEN 'In Progress' THEN '&lt;FONT COLOR=SlateGrey&gt;' || @Field2 || '&lt;/FONT&gt;' WHEN 'Running' THEN '&lt;FONT COLOR=SlateGrey&gt;' || @Field2 || '&lt;/FONT&gt;' WHEN 'Queued' THEN '&lt;FONT COLOR=orange&gt;' || @Field2 || '&lt;/FONT&gt;' WHEN 'Failed' THEN '&lt;FONT COLOR=red&gt;' || @Field2 || '&lt;/FONT&gt;' ELSE '&lt;FONT COLOR=orange&gt;' || @Field2 || '&lt;/FONT&gt;' END || '&lt;/B&gt;'</Content>
-	</DisplayField>
-	<DisplayField header="Projects" id="PROJECTS" data-type="string">
-		<DisplayFieldElement name="Field1" viewName="MR_PROJECTS" viewColumn="PROJECTS"/>
-		<description>All Projects for this session</description>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrSessionData.project"/>
-	<description>Primary Project for this session</description>
-	</DisplayField>
-	<DisplayField id="MR_PROJECT_IDENTIFIER" header="MR ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">mr_project_id</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:mrSessionData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:mrSessionData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:mrSessionData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:mrSessionData/search_field/xnat:mrSessionData.ID/project/@Field2">
-				<InsertValue id="Field1" field="SESSION_ID"/>
-				<InsertValue id="Field2" field="@WHERE"/>
-			</Property>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:mrSessionData','xnat:mrSessionData.ID');">
-				<InsertValue id="Field1" field="SESSION_ID"/>
-			</Property>
-		</HTML-Link>
-		<SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS mr_project_id,sharing_share_xnat_experimentda_id FROM (	SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE'	UNION 	SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:mrSessionData.ID" queryField="sharing_share_xnat_experimentda_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayField header="Label" id="LABEL" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrSessionData.label"/>
-		<DisplayFieldElement name="Field2" schema-element="xnat:mrSessionData.ID"/>
-		<Content type="sql">COALESCE(@Field1, @Field2)</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:mrSessionData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:mrSessionData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:mrSessionData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:mrSessionData/search_field/xnat:mrSessionData.ID">
-				<InsertValue id="Field1" field="SESSION_ID"/>
-			</Property>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:mrSessionData','xnat:mrSessionData.ID');">
-				<InsertValue id="Field1" field="SESSION_ID"/>
-			</Property>
-			<Property name="TITLE" value="Inserted: @Field1 (@Field2)">
-				<InsertValue id="Field1" field="INSERT_DATE"/>
-				<InsertValue id="Field2" field="INSERT_USER"/>
-			</Property>
-		</HTML-Link>
-		<description>Session ID</description>
-	</DisplayField>
-	<DisplayField id="MR_EXPT_COUNT" header="Count" visible="true" searchable="false" data-type="integer" xsi:type="SubQueryField">
-		<Content type="sql">mr_project_count</Content>
-		<SubQuery>SELECT COUNT(*) as mr_project_count, imagesession_id FROM xnat_mrAssessorData sad LEFT JOIN xnat_imageAssessorData iad ON sad.id=iad.id LEFT JOIN xnat_experimentData ex ON sad.ID=ex.ID JOIN xdat_meta_element xme ON ex.extension=xme.xdat_meta_element_id WHERE xme.element_name='@WHERE' GROUP BY imagesession_id</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:mrSessionData.ID" queryField="imagesession_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayField id="XNAT_MRSESSIONDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">field</Content>
-		<SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS mrsession_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:mrSessionData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:mrSessionData.ID" queryField="mrsession_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="DATE" dark-color="DEDEDE" light-color="FFFFFF" default-sort-order="DESC">
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="PROJECT"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="GENDER_TEXT" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="AGE"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="MR_SCAN_COUNT_AGG"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="listing_csv" default-order-by="DATE" dark-color="DEDEDE" light-color="FFFFFF" default-sort-order="DESC">
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="PROJECT"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="GENDER_TEXT" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="AGE"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="MR_SCAN_COUNT_AGG"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="project_bundle" default-order-by="DATE" dark-color="DEDEDE" light-color="FFFFFF" default-sort-order="DESC">
-		<DisplayFieldRef id="MR_PROJECT_IDENTIFIER"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="AGE"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="MR_SCAN_COUNT_AGG"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="root" default-order-by="DATE" dark-color="DEDEDE" light-color="FFFFFF" default-sort-order="DESC">
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="PROJECT"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="GENDER_TEXT" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="brief" default-order-by="MR_NOTES" brief-description="Mr Session" dark-color="99FF99" light-color="CCFFCC">
-		<DisplayFieldRef id="MR_NOTES"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="detailed" default-order-by="OPERATOR" brief-description="Mr Session" dark-color="99FF99" light-color="CCFFCC">
-		<DisplayFieldRef id="MR_NOTES"/>
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="COHORT" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="MARKER"/>
-		<DisplayFieldRef id="STABILIZATION"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="brief_csv" default-order-by="MR_NOTES" brief-description="Mr Session" dark-color="99FF99" light-color="CCFFCC">
-		<DisplayFieldRef id="MR_NOTES_CSV"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="detailed_csv" default-order-by="MR_NOTES" brief-description="Mr Session" dark-color="99FF99" light-color="CCFFCC">
-		<DisplayFieldRef id="MR_NOTES_CSV"/>
-		<DisplayFieldRef id="OPERATOR_CSV"/>
-		<DisplayFieldRef id="COHORT" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="SCANNER_CSV"/>
-		<DisplayFieldRef id="MARKER_CSV"/>
-		<DisplayFieldRef id="STABILIZATION_CSV"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="core" default-order-by="SESSION" brief-description="Mr Session" dark-color="dedede" light-color="ffffff">
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="GENDER_TEXT" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="core_csv" default-order-by="EXPT_DATE">
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="GENDER_TEXT" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="meta_data" default-order-by="SES" brief-description="Mr Session" dark-color="99FF99" light-color="CCFFCC">
-		<DisplayFieldRef id="RPT"/>
-		<DisplayFieldRef id="VIEW"/>
-		<DisplayFieldRef id="SESSION_ID"/>
-		<DisplayFieldRef id="LAST_MODIFIED"/>
-		<DisplayFieldRef id="INVEST"/>
-		<DisplayFieldRef id="INSERT_USER"/>
-		<DisplayFieldRef id="PREARCHIVE"/>
-	</DisplayVersion>
-	<ViewLink alias="ORDERED_WORKFLOWS">
-		<Mapping TableName="ORDERED_WORKFLOWS">
-			<MappingColumn rootElement="xnat:mrSessionData" fieldElement="xnat:mrSessionData.ID" mapsTo="id"/>
-		</Mapping>
-	</ViewLink>
-	<ViewLink alias="MR_PROJECTS">
-		<Mapping TableName="MR_PROJECTS">
-			<MappingColumn rootElement="xnat:mrSessionData" fieldElement="xnat:mrSessionData.ID" mapsTo="id"/>
-		</Mapping>
-	</ViewLink>
-	<ViewLink alias="MR_SCAN_COUNT_AGG">
-		<Mapping TableName="MR_SCAN_COUNT_AGG">
-			<MappingColumn rootElement="xnat:mrSessionData" fieldElement="xnat:mrSessionData.ID" mapsTo="image_session_id"/>
-		</Mapping>
-	</ViewLink>
-	<ViewLink alias="DTI_COUNT">
-		<Mapping TableName="DTI_COUNT">
-			<MappingColumn rootElement="xnat:mrSessionData" fieldElement="xnat:mrSessionData.ID" mapsTo="image_session_id"/>
-		</Mapping>
-	</ViewLink>
-	<ViewLink alias="SUBJECT_LABEL">
-		<Mapping TableName="SUBJECT_LABEL">
-			<MappingColumn rootElement="xnat:mrSessionData" fieldElement="xnat:mrSessionData.ID" mapsTo="image_session_id"/>
-		</Mapping>
-	</ViewLink>
-	<SQLView name="mr_scan_count_agg" sql="SELECT image_session_id, TRIM(', ' FROM xs_a_concat(TYPE_COUNT || ', ')) AS TYPE_COUNT FROM (SELECT image_session_id, (TYPE || '(' || COUNT(id) || ')') AS TYPE_COUNT FROM xnat_imageScanData GROUP BY image_session_id,TYPE ORDER BY image_session_id,TYPE) _TYPES GROUP BY image_session_id"/>
-	<SQLView name="MR_PROJECTS" sql="SELECT id, '&lt;' || expt.project || '&gt;' || xs_a_concat(',&lt;' || shared.project || '&gt;') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:mrSessionData' GROUP BY expt.id,expt.project"/>
-	<SQLView name="ordered_workflows" sql="SELECT wrk_workflowdata.id, status, wrk_workflowdata_id,
-        CASE pipeline_name
-            WHEN 'Transfer'::text THEN 'Archive'::text
-	    ELSE 
-		CASE xs_lastposition('/'::text, pipeline_name::text) WHEN 0 THEN pipeline_name ELSE
-		substring(substring(pipeline_name::text, xs_lastposition('/'::text, pipeline_name::text) + 1), 1, xs_lastposition('.'::text, substring(pipeline_name::text, xs_lastposition('/'::text, pipeline_name::text) + 1)) - 1)
-        END END AS pipeline_name
-   FROM wrk_workflowdata
-   RIGHT JOIN ( SELECT wrk_workflowdata.id, max(wrk_workflowdata.launch_time) AS launch_time
-           FROM wrk_workflowdata
-          GROUP BY wrk_workflowdata.id) wrk_max ON wrk_workflowdata.id::text = wrk_max.id::text AND wrk_workflowdata.launch_time = wrk_max.launch_time"/>
-	<SQLView name="DTI_COUNT" sql="SELECT image_session_id,COUNT(*) AS DTI_COUNT FROM xnat_imagescandata WHERE series_description LIKE '%DTI%' OR type LIKE '%DTI%' GROUP BY image_session_id"/>
-	<SQLView name="SUBJECT_LABEL" sql="SELECT isd.id AS image_session_id, sd.label AS subject_label from xnat_imageSessionData isd left join xnat_subjectassessordata sad on isd.id = sad.id LEFT JOIN xnat_subjectdata sd ON sad.subject_id = sd.id;"/>
-	<SQLFunction name="xs_lastPosition" content="CREATE OR REPLACE FUNCTION xs_lastPosition(text, text)
-  RETURNS int4 AS
-$BODY$
-    DECLARE
-       t text;
-       i int4:=0;
-    begin
-       t = $2;
-       WHILE(POSITION($1 in t)!=0) LOOP
-            i = i + POSITION($1 in t);
-            t = substring(t from (POSITION($1 in t) + 1));
-       END LOOP;
-       RETURN i;
-    END;
-$BODY$
-  LANGUAGE 'plpgsql' VOLATILE;"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/subjectData_display.xml b/src/main/webapp/schemas/xnat/display/subjectData_display.xml
deleted file mode 100644
index 98af29a2..00000000
--- a/src/main/webapp/schemas/xnat/display/subjectData_display.xml
+++ /dev/null
@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ D:/Development/XNAT/1.6/xnat_builder_1_6dev/plugin-resources/project-skeletons/xnat/src/schemas/xnat/display/subjectData_display.xml
-  ~ XNAT http://www.xnat.org
-  ~ Copyright (c) 2014, Washington University School of Medicine
-  ~ All Rights Reserved
-  ~
-  ~ Released under the Simplified BSD.
-  ~
-  ~ Last modified 2/7/14 12:19 PM
-  -->
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:subjectData" brief-description="Subjects">
-	<Arc-Definition Id="PARTICIPANT_EXPERIMENT">
-		<CommonField id="DATE" type="DATE"/>
-		<CommonField id="PART_ID" type="STRING"/>
-		<CommonField id="EXPT_ID" type="STRING"/>
-		<Bridge-Element name="xnat:subjectData" field="SUBJECT_ID"/>
-		<Filter field="EXPT_ID" filterType="distinct"/>
-		<Filter field="DATE" filterType="closest"/>
-		<Filter field="PART_ID" filterType="equals"/>
-	</Arc-Definition>
-	<DisplayField id="SUBJECT_ID" header="Subject" visible="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:subjectData.ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
-				<InsertValue id="Field1" field="SUBJECT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="SUBJECTID" header="Subject" visible="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:subjectData.ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
-				<InsertValue id="Field1" field="SUBJECT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="date">
-		<DisplayFieldElement name="Field1" schema-element="xnat:subjectData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:subjectData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayField id="GENDER" header="Gender" visible="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:demographicData.gender"/>
-	</DisplayField>
-	<DisplayField id="GENDER_TEXT" header="M/F" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:demographicData.gender"/>
-		<Content type="sql">CASE @Field1 WHEN 'male' THEN 'M' WHEN 'female' THEN 'F' ELSE 'U' END</Content>
-	</DisplayField>
-	<DisplayField id="HANDEDNESS" header="Hand" visible="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:demographicData.handedness"/>
-	</DisplayField>
-	<DisplayField id="HANDEDNESS_TEXT" header="Hand" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:demographicData.handedness"/>
-        <Content type="sql">CASE LOWER(@Field1) WHEN 'left' THEN 'L' WHEN 'right' THEN 'R' WHEN 'ambidextrous' THEN 'A' WHEN 'r' THEN 'R' WHEN 'l' THEN 'L' WHEN 'a' THEN 'A' END</Content>
-	</DisplayField>
-	<DisplayField id="DOB" header="YOB" visible="true" searchable="true" data-type="integer">
-		<DisplayFieldElement name="Field1" schema-element="xnat:demographicData.yob"/>
-		<DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
-		<Content type="sql">CAST(FLOOR(COALESCE(@Field1,EXTRACT(YEAR FROM @Field2))) AS INTEGER)</Content>
-	</DisplayField>
-	<DisplayField id="EDUC" header="Education" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:demographicData.education"/>
-	</DisplayField>
-	<DisplayField id="SES" header="Ses" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:demographicData.ses"/>
-	</DisplayField>
-	<DisplayField id="MR_COUNT" header="MR Count" visible="true" data-type="integer">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrSessionData" xdat-type="COUNT"/>
-	</DisplayField>
-	<DisplayField id="INVEST_CSV" header="PI" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:subjectData.investigator.lastname"/>
-	</DisplayField>
-	<DisplayField id="PROJECTS" header="Projects" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" viewName="SUB_PROJECTS" viewColumn="PROJECTS"/>
-		<description>All projects tied to a subject</description>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:subjectData.project"/>
-		<description>Subject's primary project</description>
-	</DisplayField>
-	<DisplayField id="SUB_GROUP" header="Group" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:subjectData.group"/>
-	</DisplayField>
-	<DisplayField header="Subject" id="SUBJECT_LABEL" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:subjectData.label"/>
-		<DisplayFieldElement name="Field2" schema-element="xnat:subjectData.ID"/>
-		<Content type="sql">COALESCE(@Field1, @Field2)</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:subjectData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:subjectData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:subjectData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:subjectData/search_field/xnat:subjectData.ID">
-				<InsertValue id="Field1" field="SUBJECTID"/>
-			</Property>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
-				<InsertValue id="Field1" field="SUBJECTID"/>
-			</Property>
-			<Property name="TITLE" value="Inserted: @Field1 (@Field2)">
-				<InsertValue id="Field1" field="INSERT_DATE"/>
-				<InsertValue id="Field2" field="INSERT_USER"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField header="Subject" id="SHARED_LABEL" data-type="string" searchable="false">
-		<DisplayFieldElement name="Field1" schema-element="xnat:subjectData/sharing/share/label"/> 
-	</DisplayField>
-	<DisplayField id="SUB_PROJECT_IDENTIFIER" header="Subject" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">sub_project_id</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:subjectData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:subjectData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:subjectData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:subjectData/search_field/xnat:subjectData.ID/project/@Field2">
-				<InsertValue id="Field1" field="SUBJECTID"/>
-				<InsertValue id="Field2" field="@WHERE"/>
-			</Property>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
-				<InsertValue id="Field1" field="SUBJECTID"/>
-			</Property>
-		</HTML-Link>
-		<SubQuery>SELECT DISTINCT CASE WHEN label='' THEN id WHEN label IS NULL THEN id ELSE label END AS sub_project_id,id AS subject_id FROM (SELECT id,project,label FROM xnat_subjectdata sub WHERE project='@WHERE' UNION SELECT subject_id,project,label FROM xnat_projectParticipant pp WHERE project='@WHERE')SEARCH</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:subjectData.ID" queryField="subject_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayField id="SUB_EXPT_COUNT" header="Count" visible="true" searchable="false" data-type="integer" xsi:type="SubQueryField">
-		<Content type="sql">sub_project_count</Content>
-		<SubQuery>SELECT COUNT(*) as sub_project_count, subject_id FROM xnat_subjectAssessorData sad LEFT JOIN xnat_experimentData ex ON sad.ID=ex.ID JOIN xdat_meta_element xme ON ex.extension=xme.xdat_meta_element_id WHERE xme.element_name='@WHERE' GROUP BY subject_id</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:subjectData.ID" queryField="subject_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayField id="XNAT_SUBJECTDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">field</Content>
-		<SubQuery>SELECT DISTINCT ON ( fields_field_xnat_subjectdata_id) fields_field_xnat_subjectdata_id AS subject_id,field FROM xnat_subjectData_field WHERE name='@WHERE'</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:subjectData.ID" queryField="subject_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayField id="ADD_IDS" header="Labels" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" viewName="SUBJECT_IDS" viewColumn="ADDIDS"/>
-		<HTML-Link>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:subjectData/search_field/xnat:subjectData.ID">
-				<InsertValue id="Field1" field="SUBJECTID"/>
-			</Property>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
-				<InsertValue id="Field1" field="SUBJECTID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="RACE" header="Race" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:demographicData.race"/>
-	</DisplayField>
-	<DisplayField id="ETHNICITY" header="Ethnicity" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:demographicData.ethnicity"/>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="SUBJECT_ID" brief-description="Subject Data" dark-color="DEDEDE" light-color="FFFFFF">
-		<DisplayFieldRef id="SUBJECT_LABEL"/>
-		<DisplayFieldRef id="GENDER"/>
-		<DisplayFieldRef id="HANDEDNESS"/>
-		<DisplayFieldRef id="DOB"/>
-		<DisplayFieldRef id="EDUC"/>
-		<DisplayFieldRef id="SES"/>
-		<DisplayFieldRef id="MR_COUNT"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="brief" default-order-by="SUBJECT_ID" brief-description="Subject Data" dark-color="DEDEDE" light-color="FFFFFF">
-		<DisplayFieldRef id="SUBJECT_LABEL"/>
-		<DisplayFieldRef id="GENDER"/>
-		<DisplayFieldRef id="HANDEDNESS"/>
-		<DisplayFieldRef id="DOB"/>
-		<DisplayFieldRef id="EDUC"/>
-		<DisplayFieldRef id="SES"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="project_bundle" default-order-by="SUBJECTID" brief-description="Participant Demographics" dark-color="DEDEDE" light-color="FFFFFF">
-		<DisplayFieldRef id="SUB_PROJECT_IDENTIFIER"/>
-		<DisplayFieldRef id="GENDER_TEXT"/>
-		<DisplayFieldRef id="HANDEDNESS_TEXT"/>
-		<DisplayFieldRef id="DOB"/>
-	</DisplayVersion>
-	<ViewLink alias="SUB_PROJECTS">
-		<Mapping TableName="SUB_PROJECTS">
-			<MappingColumn rootElement="xnat:subjectData" fieldElement="xnat:subjectData.ID" mapsTo="id"/>
-		</Mapping>
-	</ViewLink>
-	<ViewLink alias="SUBJECT_IDS">
-		<Mapping TableName="SUBJECT_IDS">
-			<MappingColumn rootElement="xnat:subjectData" fieldElement="xnat:subjectData.ID" mapsTo="subject_id"/>
-		</Mapping>
-	</ViewLink>
-	<SQLView name="SUBJECT_IDS" sql="SELECT sub.ID as subject_id,sub.label ||', '|| TRIM(', ' FROM xs_a_concat(pp.label || ', ')) AS ADDIDS FROM xnat_subjectData sub LEFT JOIN xnat_projectParticipant pp ON sub.id=pp.subject_id WHERE subject_id IS NOT NULL GROUP BY ID,sub.label"/>
-	<SQLView name="SUB_PROJECTS" sql="SELECT id, ',&lt;' || sub.project || '&gt;' || xs_a_concat(',&lt;' || shared.project || '&gt;') AS PROJECTS FROM xnat_subjectData sub LEFT JOIN xnat_projectParticipant shared ON sub.id=shared.subject_id GROUP BY sub.id,sub.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_crScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_crScanData_display.xml
deleted file mode 100644
index 153b69a7..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_crScanData_display.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:crScanData" full-description="CRScan" brief-description="CRScan">
-	<DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:crScanData/image_session_ID"/>
-	</DisplayField>
-	<DisplayField id="NOTE" header="note" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:crScanData/note"/>
-	</DisplayField>
-	<DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:crScanData/quality"/>
-	</DisplayField>
-	<DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:crScanData/condition"/>
-	</DisplayField>
-	<DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:crScanData/series_description"/>
-	</DisplayField>
-	<DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:crScanData/documentation"/>
-	</DisplayField>
-	<DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:crScanData/scanner"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:crScanData/scanner/manufacturer"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:crScanData/scanner/model"/>
-	</DisplayField>
-	<DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:crScanData/modality"/>
-	</DisplayField>
-	<DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:crScanData/frames"/>
-	</DisplayField>
-	<DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:crScanData/operator"/>
-	</DisplayField>
-	<DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:crScanData/startTime"/>
-	</DisplayField>
-	<DisplayField id="ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:crScanData/ID"/>
-	</DisplayField>
-	<DisplayField id="TYPE" header="type" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:crScanData/type"/>
-	</DisplayField>
-	<DisplayField id="UID" header="UID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:crScanData/UID"/>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="project" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:crScanData/project"/>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:crScanData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:crScanData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="CRScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="CRScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-	</DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_crSessionData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_crSessionData_display.xml
deleted file mode 100644
index 14b1b327..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_crSessionData_display.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:crSessionData" full-description="CRSession" brief-description="CRSession">
-	<Arc name="PARTICIPANT_EXPERIMENT">
-		<CommonField id="PART_ID" local-field="SUBJECT_ID"/>
-		<CommonField id="DATE" local-field="DATE"/>
-		<CommonField id="EXPT_ID" local-field="EXPT_ID"/>
-	</Arc>
-	<DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:crSessionData.subject_ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
-				<InsertValue id="Field1" field="SUBJECT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:crSessionData.ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:crSessionData','xnat:crSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="RPT" header="ID" visible="true" image="true">
-		<Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:crSessionData','xnat:crSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="DATE" header="Date" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:crSessionData.date"/>
-	</DisplayField>
-	<DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
-	<DisplayFieldElement name="Field1" schema-element="xnat:crSessionData.date"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
-	<DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
-	<Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
-	</DisplayField>
-	<DisplayField header="Projects" id="PROJECTS" data-type="string">
-		<DisplayFieldElement name="Field1" viewName="XNAT_CRSESSIONDATA_PROJECTS" viewColumn="PROJECTS"/>
-	</DisplayField>
-	<DisplayField header="Label" id="LABEL" data-type="string">
-	<DisplayFieldElement name="Field1" schema-element="xnat:crSessionData.ID"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:crSessionData.label"/>
-	<Content type="sql">COALESCE(@Field2, @Field1)</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:crSessionData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:crSessionData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:crSessionData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:crSessionData/search_field/xnat:crSessionData.ID">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:crSessionData','xnat:crSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="TITLE" value="Inserted: @Field1 (@Field2)">
-				<InsertValue id="Field1" field="INSERT_DATE"/>
-				<InsertValue id="Field2" field="INSERT_USER"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:crSessionData.project"/>
-	</DisplayField>
-	<DisplayField id="XNAT_CRSESSIONDATA_PROJECT_IDENTIFIER" header="XNAT_CRSESSIONDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">xnat_crsessiondata_project_id</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:crSessionData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:crSessionData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:crSessionData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:crSessionData/search_field/xnat:crSessionData.ID/project/@Field2">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-				<InsertValue id="Field2" field="@WHERE"/>
-			</Property>
-		</HTML-Link>
-		<SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_crsessiondata_project_id,sharing_share_xnat_experimentda_id FROM (	SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE'	UNION 	SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:crSessionData.ID" queryField="sharing_share_xnat_experimentda_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:crSessionData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:crSessionData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayField id="XNAT_CRSESSIONDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">field</Content>
-		<SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:crSessionData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:crSessionData.ID" queryField="expt_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="CRSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="RPT"/>
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="CRSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="CRSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="EXPT_ID"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="CRSession" dark-color="9999CC" light-color="CCCCFF">
-	</DisplayVersion>
-	<DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="CRSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="XNAT_CRSESSIONDATA_PROJECT_IDENTIFIER"/>
-		<DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<ViewLink alias="XNAT_CRSESSIONDATA_PROJECTS">
-		<Mapping TableName="XNAT_CRSESSIONDATA_PROJECTS">
-			<MappingColumn rootElement="xnat:crSessionData" fieldElement="xnat:crSessionData.ID" mapsTo="id"/>
-		</Mapping>
-	</ViewLink>
-	<SQLView name="XNAT_CRSESSIONDATA_PROJECTS" sql="SELECT id, '&lt;' || expt.project || '&gt;' || xs_a_concat(',&lt;' || shared.project || '&gt;') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:crSessionData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_ctScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_ctScanData_display.xml
deleted file mode 100644
index a70c7be2..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_ctScanData_display.xml
+++ /dev/null
@@ -1,278 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:ctScanData" full-description="CTScan" brief-description="CTScan">
-	<DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/image_session_ID"/>
-	</DisplayField>
-	<DisplayField id="NOTE" header="note" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/note"/>
-	</DisplayField>
-	<DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/quality"/>
-	</DisplayField>
-	<DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/condition"/>
-	</DisplayField>
-	<DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/series_description"/>
-	</DisplayField>
-	<DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/documentation"/>
-	</DisplayField>
-	<DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/scanner"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/scanner/manufacturer"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/scanner/model"/>
-	</DisplayField>
-	<DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/modality"/>
-	</DisplayField>
-	<DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/frames"/>
-	</DisplayField>
-	<DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/operator"/>
-	</DisplayField>
-	<DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/startTime"/>
-	</DisplayField>
-	<DisplayField id="ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/ID"/>
-	</DisplayField>
-	<DisplayField id="TYPE" header="type" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/type"/>
-	</DisplayField>
-	<DisplayField id="UID" header="UID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/UID"/>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="project" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/project"/>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctScanData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctScanData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_VOXELRES_UNITS" header="units" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/voxelRes/units"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_VOXELRES_X" header="x" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/voxelRes/x"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_VOXELRES_Y" header="y" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/voxelRes/y"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_VOXELRES_Z" header="z" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/voxelRes/z"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_ORIENTATION" header="orientation" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/orientation"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_FOV_X" header="x" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/fov/x"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_FOV_Y" header="y" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/fov/y"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_RESCALE_INTERCEPT" header="intercept" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/rescale/intercept"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_RESCALE_SLOPE" header="slope" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/rescale/slope"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_KVP" header="kvp" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/kvp"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_ACQUISITIONNUMBER" header="acquisitionNumber" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/acquisitionNumber"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_IMAGETYPE" header="imageType" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/imageType"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_OPTIONS" header="options" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/options"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_COLLECTIONDIAMETER" header="collectionDiameter" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/collectionDiameter"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_DISTANCESOURCETODETECTOR" header="distanceSourceToDetector" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/distanceSourceToDetector"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_DISTANCESOURCETOPATIENT" header="distanceSourceToPatient" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/distanceSourceToPatient"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_GANTRYTILT" header="gantryTilt" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/gantryTilt"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_TABLEHEIGHT" header="tableHeight" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/tableHeight"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_ROTATIONDIRECTION" header="rotationDirection" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/rotationDirection"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_EXPOSURETIME" header="exposureTime" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/exposureTime"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_XRAYTUBECURRENT" header="xrayTubeCurrent" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/xrayTubeCurrent"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_EXPOSURE" header="exposure" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/exposure"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_FILTER" header="filter" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/filter"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_GENERATORPOWER" header="generatorPower" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/generatorPower"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_CONVOLUTIONKERNEL" header="convolutionKernel" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/convolutionKernel"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_COLLIMATIONWIDTH_SINGLE" header="single" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/collimationWidth/single"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_COLLIMATIONWIDTH_TOTAL" header="total" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/collimationWidth/total"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_TABLESPEED" header="tableSpeed" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/tableSpeed"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_TABLEFEEDPERROTATION" header="tableFeedPerRotation" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/tableFeedPerRotation"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_PITCHFACTOR" header="pitchFactor" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/pitchFactor"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_ESTIMATEDDOSESAVING_MODULATION" header="modulation" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/estimatedDoseSaving/modulation"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_ESTIMATEDDOSESAVING" header="estimatedDoseSaving" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/estimatedDoseSaving"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_CTDIVOL" header="ctDIvol" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/ctDIvol"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_DERIVATION" header="derivation" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/derivation"/>
-	</DisplayField>
-	<DisplayField id="DCMVALIDATION" header="dcmValidation" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/dcmValidation"/>
-	</DisplayField>
-	<DisplayField id="DCMVALIDATION_STATUS" header="status" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/dcmValidation/status"/>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="CTScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-		<DisplayFieldRef id="PARAMETERS_VOXELRES_UNITS"/>
-		<DisplayFieldRef id="PARAMETERS_VOXELRES_X"/>
-		<DisplayFieldRef id="PARAMETERS_VOXELRES_Y"/>
-		<DisplayFieldRef id="PARAMETERS_VOXELRES_Z"/>
-		<DisplayFieldRef id="PARAMETERS_ORIENTATION"/>
-		<DisplayFieldRef id="PARAMETERS_FOV_X"/>
-		<DisplayFieldRef id="PARAMETERS_FOV_Y"/>
-		<DisplayFieldRef id="PARAMETERS_RESCALE_INTERCEPT"/>
-		<DisplayFieldRef id="PARAMETERS_RESCALE_SLOPE"/>
-		<DisplayFieldRef id="PARAMETERS_KVP"/>
-		<DisplayFieldRef id="PARAMETERS_ACQUISITIONNUMBER"/>
-		<DisplayFieldRef id="PARAMETERS_IMAGETYPE"/>
-		<DisplayFieldRef id="PARAMETERS_OPTIONS"/>
-		<DisplayFieldRef id="PARAMETERS_COLLECTIONDIAMETER"/>
-		<DisplayFieldRef id="PARAMETERS_DISTANCESOURCETODETECTOR"/>
-		<DisplayFieldRef id="PARAMETERS_DISTANCESOURCETOPATIENT"/>
-		<DisplayFieldRef id="PARAMETERS_GANTRYTILT"/>
-		<DisplayFieldRef id="PARAMETERS_TABLEHEIGHT"/>
-		<DisplayFieldRef id="PARAMETERS_ROTATIONDIRECTION"/>
-		<DisplayFieldRef id="PARAMETERS_EXPOSURETIME"/>
-		<DisplayFieldRef id="PARAMETERS_XRAYTUBECURRENT"/>
-		<DisplayFieldRef id="PARAMETERS_EXPOSURE"/>
-		<DisplayFieldRef id="PARAMETERS_FILTER"/>
-		<DisplayFieldRef id="PARAMETERS_GENERATORPOWER"/>
-		<DisplayFieldRef id="PARAMETERS_CONVOLUTIONKERNEL"/>
-		<DisplayFieldRef id="PARAMETERS_COLLIMATIONWIDTH_SINGLE"/>
-		<DisplayFieldRef id="PARAMETERS_COLLIMATIONWIDTH_TOTAL"/>
-		<DisplayFieldRef id="PARAMETERS_TABLESPEED"/>
-		<DisplayFieldRef id="PARAMETERS_TABLEFEEDPERROTATION"/>
-		<DisplayFieldRef id="PARAMETERS_PITCHFACTOR"/>
-		<DisplayFieldRef id="PARAMETERS_ESTIMATEDDOSESAVING_MODULATION"/>
-		<DisplayFieldRef id="PARAMETERS_ESTIMATEDDOSESAVING"/>
-		<DisplayFieldRef id="PARAMETERS_CTDIVOL"/>
-		<DisplayFieldRef id="PARAMETERS_DERIVATION"/>
-		<DisplayFieldRef id="DCMVALIDATION"/>
-		<DisplayFieldRef id="DCMVALIDATION_STATUS"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="CTScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-		<DisplayFieldRef id="PARAMETERS_VOXELRES_UNITS"/>
-		<DisplayFieldRef id="PARAMETERS_VOXELRES_X"/>
-		<DisplayFieldRef id="PARAMETERS_VOXELRES_Y"/>
-		<DisplayFieldRef id="PARAMETERS_VOXELRES_Z"/>
-		<DisplayFieldRef id="PARAMETERS_ORIENTATION"/>
-		<DisplayFieldRef id="PARAMETERS_FOV_X"/>
-		<DisplayFieldRef id="PARAMETERS_FOV_Y"/>
-		<DisplayFieldRef id="PARAMETERS_RESCALE_INTERCEPT"/>
-		<DisplayFieldRef id="PARAMETERS_RESCALE_SLOPE"/>
-		<DisplayFieldRef id="PARAMETERS_KVP"/>
-		<DisplayFieldRef id="PARAMETERS_ACQUISITIONNUMBER"/>
-		<DisplayFieldRef id="PARAMETERS_IMAGETYPE"/>
-		<DisplayFieldRef id="PARAMETERS_OPTIONS"/>
-		<DisplayFieldRef id="PARAMETERS_COLLECTIONDIAMETER"/>
-		<DisplayFieldRef id="PARAMETERS_DISTANCESOURCETODETECTOR"/>
-		<DisplayFieldRef id="PARAMETERS_DISTANCESOURCETOPATIENT"/>
-		<DisplayFieldRef id="PARAMETERS_GANTRYTILT"/>
-		<DisplayFieldRef id="PARAMETERS_TABLEHEIGHT"/>
-		<DisplayFieldRef id="PARAMETERS_ROTATIONDIRECTION"/>
-		<DisplayFieldRef id="PARAMETERS_EXPOSURETIME"/>
-		<DisplayFieldRef id="PARAMETERS_XRAYTUBECURRENT"/>
-		<DisplayFieldRef id="PARAMETERS_EXPOSURE"/>
-		<DisplayFieldRef id="PARAMETERS_FILTER"/>
-		<DisplayFieldRef id="PARAMETERS_GENERATORPOWER"/>
-		<DisplayFieldRef id="PARAMETERS_CONVOLUTIONKERNEL"/>
-		<DisplayFieldRef id="PARAMETERS_COLLIMATIONWIDTH_SINGLE"/>
-		<DisplayFieldRef id="PARAMETERS_COLLIMATIONWIDTH_TOTAL"/>
-		<DisplayFieldRef id="PARAMETERS_TABLESPEED"/>
-		<DisplayFieldRef id="PARAMETERS_TABLEFEEDPERROTATION"/>
-		<DisplayFieldRef id="PARAMETERS_PITCHFACTOR"/>
-		<DisplayFieldRef id="PARAMETERS_ESTIMATEDDOSESAVING_MODULATION"/>
-		<DisplayFieldRef id="PARAMETERS_ESTIMATEDDOSESAVING"/>
-		<DisplayFieldRef id="PARAMETERS_CTDIVOL"/>
-		<DisplayFieldRef id="PARAMETERS_DERIVATION"/>
-		<DisplayFieldRef id="DCMVALIDATION"/>
-		<DisplayFieldRef id="DCMVALIDATION_STATUS"/>
-	</DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_ctSessionData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_ctSessionData_display.xml
deleted file mode 100644
index 84b377e6..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_ctSessionData_display.xml
+++ /dev/null
@@ -1,180 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ D:/Development/XNAT/1.6/xnat_builder_1_6dev/plugin-resources/project-skeletons/xnat/src/schemas/xnat/display/xnat_ctSessionData_display.xml
-  ~ XNAT http://www.xnat.org
-  ~ Copyright (c) 2014, Washington University School of Medicine
-  ~ All Rights Reserved
-  ~
-  ~ Released under the Simplified BSD.
-  ~
-  ~ Last modified 2/7/14 12:19 PM
-  -->
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:ctSessionData" full-description="CTSession" brief-description="CTSession">
-	<Arc name="PARTICIPANT_EXPERIMENT">
-		<CommonField id="PART_ID" local-field="SUBJECT_ID"/>
-		<CommonField id="DATE" local-field="DATE"/>
-		<CommonField id="EXPT_ID" local-field="EXPT_ID"/>
-	</Arc>
-	<DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctSessionData.subject_ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
-				<InsertValue id="Field1" field="SUBJECT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctSessionData.ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:ctSessionData','xnat:ctSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="RPT" header="ID" visible="true" image="true">
-		<Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:ctSessionData','xnat:ctSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="DATE" header="Date" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctSessionData.date"/>
-	</DisplayField>
-	<DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctSessionData.date"/>
-		<DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
-		<DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
-		<Content type="sql">CAST(COALESCE(EXTRACT(YEAR FROM AGE(@Field1, @Field2)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
-	</DisplayField>
-	<DisplayField header="Projects" id="PROJECTS" data-type="string">
-		<DisplayFieldElement name="Field1" viewName="XNAT_CTSESSIONDATA_PROJECTS" viewColumn="PROJECTS"/>
-	</DisplayField>
-	<DisplayField header="Label" id="LABEL" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctSessionData.ID"/>
-		<DisplayFieldElement name="Field2" schema-element="xnat:ctSessionData.label"/>
-		<Content type="sql">COALESCE(@Field2, @Field1)</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:ctSessionData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:ctSessionData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:ctSessionData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:ctSessionData/search_field/xnat:ctSessionData.ID">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:ctSessionData','xnat:ctSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="TITLE" value="Inserted: @Field1 (@Field2)">
-				<InsertValue id="Field1" field="INSERT_DATE"/>
-				<InsertValue id="Field2" field="INSERT_USER"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctSessionData.project"/>
-	</DisplayField>
-	<DisplayField id="XNAT_CTSESSIONDATA_PROJECT_IDENTIFIER" header="XNAT_CTSESSIONDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">xnat_ctsessiondata_project_id</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:ctSessionData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:ctSessionData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:ctSessionData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:ctSessionData/search_field/xnat:ctSessionData.ID/project/@Field2">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-				<InsertValue id="Field2" field="@WHERE"/>
-			</Property>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:ctSessionData','xnat:ctSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-		<SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_ctsessiondata_project_id,sharing_share_xnat_experimentda_id FROM (	SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE'	UNION 	SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:ctSessionData.ID" queryField="sharing_share_xnat_experimentda_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctSessionData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctSessionData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayField id="XNAT_CTSESSIONDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">field</Content>
-		<SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:ctSessionData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:ctSessionData.ID" queryField="expt_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayField id="DCMACCESSIONNUMBER" header="dcmAccessionNumber" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctSessionData/dcmAccessionNumber"/>
-	</DisplayField>
-	<DisplayField id="DCMPATIENTID" header="dcmPatientId" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctSessionData/dcmPatientId"/>
-	</DisplayField>
-	<DisplayField id="DCMPATIENTNAME" header="dcmPatientName" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctSessionData/dcmPatientName"/>
-	</DisplayField>
-	<DisplayField id="UID" header="UID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ctSessionData/UID"/>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="CTSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="RPT"/>
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="AGE"/>
-		<DisplayFieldRef id="DCMACCESSIONNUMBER"/>
-		<DisplayFieldRef id="DCMPATIENTID"/>
-		<DisplayFieldRef id="DCMPATIENTNAME"/>
-		<DisplayFieldRef id="UID"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="CTSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-		<DisplayFieldRef id="DCMACCESSIONNUMBER"/>
-		<DisplayFieldRef id="DCMPATIENTID"/>
-		<DisplayFieldRef id="DCMPATIENTNAME"/>
-		<DisplayFieldRef id="UID"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="CTSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="EXPT_ID"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-		<DisplayFieldRef id="DCMACCESSIONNUMBER"/>
-		<DisplayFieldRef id="DCMPATIENTID"/>
-		<DisplayFieldRef id="DCMPATIENTNAME"/>
-		<DisplayFieldRef id="UID"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="CTSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="DCMACCESSIONNUMBER"/>
-		<DisplayFieldRef id="DCMPATIENTID"/>
-		<DisplayFieldRef id="DCMPATIENTNAME"/>
-		<DisplayFieldRef id="UID"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="CTSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="XNAT_CTSESSIONDATA_PROJECT_IDENTIFIER"/>
-		<DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-		<DisplayFieldRef id="DCMACCESSIONNUMBER"/>
-		<DisplayFieldRef id="DCMPATIENTID"/>
-		<DisplayFieldRef id="DCMPATIENTNAME"/>
-		<DisplayFieldRef id="UID"/>
-	</DisplayVersion>
-	<ViewLink alias="XNAT_CTSESSIONDATA_PROJECTS">
-		<Mapping TableName="XNAT_CTSESSIONDATA_PROJECTS">
-			<MappingColumn rootElement="xnat:ctSessionData" fieldElement="xnat:ctSessionData.ID" mapsTo="id"/>
-		</Mapping>
-	</ViewLink>
-	<SQLView name="XNAT_CTSESSIONDATA_PROJECTS" sql="SELECT id, '&lt;' || expt.project || '&gt;' || xs_a_concat(',&lt;' || shared.project || '&gt;') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:ctSessionData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_dx3DCraniofacialScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_dx3DCraniofacialScanData_display.xml
deleted file mode 100644
index 053d3756..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_dx3DCraniofacialScanData_display.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:dx3DCraniofacialScanData" full-description="DX3DCraniofacialScan" brief-description="DX3DCraniofacialScan">
-	<DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:dx3DCraniofacialScanData/image_session_ID"/>
-	</DisplayField>
-	<DisplayField id="NOTE" header="note" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:dx3DCraniofacialScanData/note"/>
-	</DisplayField>
-	<DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:dx3DCraniofacialScanData/quality"/>
-	</DisplayField>
-	<DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:dx3DCraniofacialScanData/condition"/>
-	</DisplayField>
-	<DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:dx3DCraniofacialScanData/series_description"/>
-	</DisplayField>
-	<DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:dx3DCraniofacialScanData/documentation"/>
-	</DisplayField>
-	<DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:dx3DCraniofacialScanData/scanner"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:dx3DCraniofacialScanData/scanner/manufacturer"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:dx3DCraniofacialScanData/scanner/model"/>
-	</DisplayField>
-	<DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:dx3DCraniofacialScanData/modality"/>
-	</DisplayField>
-	<DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:dx3DCraniofacialScanData/frames"/>
-	</DisplayField>
-	<DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:dx3DCraniofacialScanData/operator"/>
-	</DisplayField>
-	<DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:dx3DCraniofacialScanData/startTime"/>
-	</DisplayField>
-	<DisplayField id="ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:dx3DCraniofacialScanData/ID"/>
-	</DisplayField>
-	<DisplayField id="TYPE" header="type" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:dx3DCraniofacialScanData/type"/>
-	</DisplayField>
-	<DisplayField id="UID" header="UID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:dx3DCraniofacialScanData/UID"/>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="project" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:dx3DCraniofacialScanData/project"/>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:dx3DCraniofacialScanData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:dx3DCraniofacialScanData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="DX3DCraniofacialScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="DX3DCraniofacialScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-	</DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_dx3DCraniofacialSessionData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_dx3DCraniofacialSessionData_display.xml
deleted file mode 100644
index c33a9492..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_dx3DCraniofacialSessionData_display.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:dx3DCraniofacialSessionData" full-description="DX3DCraniofacialSession" brief-description="DX3DCraniofacialSession">
-	<Arc name="PARTICIPANT_EXPERIMENT">
-		<CommonField id="PART_ID" local-field="SUBJECT_ID"/>
-		<CommonField id="DATE" local-field="DATE"/>
-		<CommonField id="EXPT_ID" local-field="EXPT_ID"/>
-	</Arc>
-	<DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:dx3DCraniofacialSessionData.subject_ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
-				<InsertValue id="Field1" field="SUBJECT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:dx3DCraniofacialSessionData.ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:dx3DCraniofacialSessionData','xnat:dx3DCraniofacialSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="RPT" header="ID" visible="true" image="true">
-		<Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:dx3DCraniofacialSessionData','xnat:dx3DCraniofacialSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="DATE" header="Date" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:dx3DCraniofacialSessionData.date"/>
-	</DisplayField>
-	<DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
-	<DisplayFieldElement name="Field1" schema-element="xnat:dx3DCraniofacialSessionData.date"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
-	<DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
-	<Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
-	</DisplayField>
-	<DisplayField header="Projects" id="PROJECTS" data-type="string">
-		<DisplayFieldElement name="Field1" viewName="XNAT_DX3DCRANIOFACIALSESSIONDATA_PROJECTS" viewColumn="PROJECTS"/>
-	</DisplayField>
-	<DisplayField header="Label" id="LABEL" data-type="string">
-	<DisplayFieldElement name="Field1" schema-element="xnat:dx3DCraniofacialSessionData.ID"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:dx3DCraniofacialSessionData.label"/>
-	<Content type="sql">COALESCE(@Field2, @Field1)</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:dx3DCraniofacialSessionData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:dx3DCraniofacialSessionData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:dx3DCraniofacialSessionData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:dx3DCraniofacialSessionData/search_field/xnat:dx3DCraniofacialSessionData.ID">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:dx3DCraniofacialSessionData','xnat:dx3DCraniofacialSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="TITLE" value="Inserted: @Field1 (@Field2)">
-				<InsertValue id="Field1" field="INSERT_DATE"/>
-				<InsertValue id="Field2" field="INSERT_USER"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:dx3DCraniofacialSessionData.project"/>
-	</DisplayField>
-	<DisplayField id="XNAT_DX3DCRANIOFACIALSESSIONDATA_PROJECT_IDENTIFIER" header="XNAT_DX3DCRANIOFACIALSESSIONDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">xnat_dx3dcraniofacialsessiondata_project_id</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:dx3DCraniofacialSessionData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:dx3DCraniofacialSessionData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:dx3DCraniofacialSessionData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:dx3DCraniofacialSessionData/search_field/xnat:dx3DCraniofacialSessionData.ID/project/@Field2">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-				<InsertValue id="Field2" field="@WHERE"/>
-			</Property>
-		</HTML-Link>
-		<SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_dx3dcraniofacialsessiondata_project_id,sharing_share_xnat_experimentda_id FROM (	SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE'	UNION 	SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:dx3DCraniofacialSessionData.ID" queryField="sharing_share_xnat_experimentda_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:dx3DCraniofacialSessionData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:dx3DCraniofacialSessionData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayField id="XNAT_DX3DCRANIOFACIALSESSIONDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">field</Content>
-		<SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:dx3DCraniofacialSessionData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:dx3DCraniofacialSessionData.ID" queryField="expt_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="DX3DCraniofacialSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="RPT"/>
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="DX3DCraniofacialSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="DX3DCraniofacialSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="EXPT_ID"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="DX3DCraniofacialSession" dark-color="9999CC" light-color="CCCCFF">
-	</DisplayVersion>
-	<DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="DX3DCraniofacialSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="XNAT_DX3DCRANIOFACIALSESSIONDATA_PROJECT_IDENTIFIER"/>
-		<DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<ViewLink alias="XNAT_DX3DCRANIOFACIALSESSIONDATA_PROJECTS">
-		<Mapping TableName="XNAT_DX3DCRANIOFACIALSESSIONDATA_PROJECTS">
-			<MappingColumn rootElement="xnat:dx3DCraniofacialSessionData" fieldElement="xnat:dx3DCraniofacialSessionData.ID" mapsTo="id"/>
-		</Mapping>
-	</ViewLink>
-	<SQLView name="XNAT_DX3DCRANIOFACIALSESSIONDATA_PROJECTS" sql="SELECT id, '&lt;' || expt.project || '&gt;' || xs_a_concat(',&lt;' || shared.project || '&gt;') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:dx3DCraniofacialSessionData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_dxScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_dxScanData_display.xml
deleted file mode 100644
index c66359c1..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_dxScanData_display.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:dxScanData" full-description="DXScan" brief-description="DXScan">
-	<DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:dxScanData/image_session_ID"/>
-	</DisplayField>
-	<DisplayField id="NOTE" header="note" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:dxScanData/note"/>
-	</DisplayField>
-	<DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:dxScanData/quality"/>
-	</DisplayField>
-	<DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:dxScanData/condition"/>
-	</DisplayField>
-	<DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:dxScanData/series_description"/>
-	</DisplayField>
-	<DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:dxScanData/documentation"/>
-	</DisplayField>
-	<DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:dxScanData/scanner"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:dxScanData/scanner/manufacturer"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:dxScanData/scanner/model"/>
-	</DisplayField>
-	<DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:dxScanData/modality"/>
-	</DisplayField>
-	<DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:dxScanData/frames"/>
-	</DisplayField>
-	<DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:dxScanData/operator"/>
-	</DisplayField>
-	<DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:dxScanData/startTime"/>
-	</DisplayField>
-	<DisplayField id="ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:dxScanData/ID"/>
-	</DisplayField>
-	<DisplayField id="TYPE" header="type" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:dxScanData/type"/>
-	</DisplayField>
-	<DisplayField id="UID" header="UID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:dxScanData/UID"/>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="project" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:dxScanData/project"/>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:dxScanData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:dxScanData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="DXScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="DXScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-	</DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_dxSessionData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_dxSessionData_display.xml
deleted file mode 100644
index ccebdb02..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_dxSessionData_display.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:dxSessionData" full-description="DXSession" brief-description="DXSession">
-	<Arc name="PARTICIPANT_EXPERIMENT">
-		<CommonField id="PART_ID" local-field="SUBJECT_ID"/>
-		<CommonField id="DATE" local-field="DATE"/>
-		<CommonField id="EXPT_ID" local-field="EXPT_ID"/>
-	</Arc>
-	<DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:dxSessionData.subject_ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
-				<InsertValue id="Field1" field="SUBJECT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:dxSessionData.ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:dxSessionData','xnat:dxSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="RPT" header="ID" visible="true" image="true">
-		<Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:dxSessionData','xnat:dxSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="DATE" header="Date" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:dxSessionData.date"/>
-	</DisplayField>
-	<DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
-	<DisplayFieldElement name="Field1" schema-element="xnat:dxSessionData.date"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
-	<DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
-	<Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
-	</DisplayField>
-	<DisplayField header="Projects" id="PROJECTS" data-type="string">
-		<DisplayFieldElement name="Field1" viewName="XNAT_DXSESSIONDATA_PROJECTS" viewColumn="PROJECTS"/>
-	</DisplayField>
-	<DisplayField header="Label" id="LABEL" data-type="string">
-	<DisplayFieldElement name="Field1" schema-element="xnat:dxSessionData.ID"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:dxSessionData.label"/>
-	<Content type="sql">COALESCE(@Field2, @Field1)</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:dxSessionData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:dxSessionData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:dxSessionData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:dxSessionData/search_field/xnat:dxSessionData.ID">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:dxSessionData','xnat:dxSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="TITLE" value="Inserted: @Field1 (@Field2)">
-				<InsertValue id="Field1" field="INSERT_DATE"/>
-				<InsertValue id="Field2" field="INSERT_USER"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:dxSessionData.project"/>
-	</DisplayField>
-	<DisplayField id="XNAT_DXSESSIONDATA_PROJECT_IDENTIFIER" header="XNAT_DXSESSIONDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">xnat_dxsessiondata_project_id</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:dxSessionData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:dxSessionData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:dxSessionData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:dxSessionData/search_field/xnat:dxSessionData.ID/project/@Field2">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-				<InsertValue id="Field2" field="@WHERE"/>
-			</Property>
-		</HTML-Link>
-		<SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_dxsessiondata_project_id,sharing_share_xnat_experimentda_id FROM (	SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE'	UNION 	SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:dxSessionData.ID" queryField="sharing_share_xnat_experimentda_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:dxSessionData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:dxSessionData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayField id="XNAT_DXSESSIONDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">field</Content>
-		<SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:dxSessionData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:dxSessionData.ID" queryField="expt_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="DXSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="RPT"/>
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="DXSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="DXSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="EXPT_ID"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="DXSession" dark-color="9999CC" light-color="CCCCFF">
-	</DisplayVersion>
-	<DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="DXSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="XNAT_DXSESSIONDATA_PROJECT_IDENTIFIER"/>
-		<DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<ViewLink alias="XNAT_DXSESSIONDATA_PROJECTS">
-		<Mapping TableName="XNAT_DXSESSIONDATA_PROJECTS">
-			<MappingColumn rootElement="xnat:dxSessionData" fieldElement="xnat:dxSessionData.ID" mapsTo="id"/>
-		</Mapping>
-	</ViewLink>
-	<SQLView name="XNAT_DXSESSIONDATA_PROJECTS" sql="SELECT id, '&lt;' || expt.project || '&gt;' || xs_a_concat(',&lt;' || shared.project || '&gt;') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:dxSessionData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_ecgScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_ecgScanData_display.xml
deleted file mode 100644
index 10dfda62..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_ecgScanData_display.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:ecgScanData" full-description="ECGScan" brief-description="ECGScan">
-	<DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ecgScanData/image_session_ID"/>
-	</DisplayField>
-	<DisplayField id="NOTE" header="note" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ecgScanData/note"/>
-	</DisplayField>
-	<DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ecgScanData/quality"/>
-	</DisplayField>
-	<DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ecgScanData/condition"/>
-	</DisplayField>
-	<DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ecgScanData/series_description"/>
-	</DisplayField>
-	<DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ecgScanData/documentation"/>
-	</DisplayField>
-	<DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ecgScanData/scanner"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ecgScanData/scanner/manufacturer"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ecgScanData/scanner/model"/>
-	</DisplayField>
-	<DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ecgScanData/modality"/>
-	</DisplayField>
-	<DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ecgScanData/frames"/>
-	</DisplayField>
-	<DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ecgScanData/operator"/>
-	</DisplayField>
-	<DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ecgScanData/startTime"/>
-	</DisplayField>
-	<DisplayField id="ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ecgScanData/ID"/>
-	</DisplayField>
-	<DisplayField id="TYPE" header="type" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ecgScanData/type"/>
-	</DisplayField>
-	<DisplayField id="UID" header="UID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ecgScanData/UID"/>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="project" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ecgScanData/project"/>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ecgScanData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ecgScanData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="ECGScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="ECGScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-	</DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_ecgSessionData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_ecgSessionData_display.xml
deleted file mode 100644
index 762b6821..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_ecgSessionData_display.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:ecgSessionData" full-description="ECGSession" brief-description="ECGSession">
-	<Arc name="PARTICIPANT_EXPERIMENT">
-		<CommonField id="PART_ID" local-field="SUBJECT_ID"/>
-		<CommonField id="DATE" local-field="DATE"/>
-		<CommonField id="EXPT_ID" local-field="EXPT_ID"/>
-	</Arc>
-	<DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ecgSessionData.subject_ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
-				<InsertValue id="Field1" field="SUBJECT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ecgSessionData.ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:ecgSessionData','xnat:ecgSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="RPT" header="ID" visible="true" image="true">
-		<Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:ecgSessionData','xnat:ecgSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="DATE" header="Date" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ecgSessionData.date"/>
-	</DisplayField>
-	<DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
-	<DisplayFieldElement name="Field1" schema-element="xnat:ecgSessionData.date"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
-	<DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
-	<Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
-	</DisplayField>
-	<DisplayField header="Projects" id="PROJECTS" data-type="string">
-		<DisplayFieldElement name="Field1" viewName="XNAT_ECGSESSIONDATA_PROJECTS" viewColumn="PROJECTS"/>
-	</DisplayField>
-	<DisplayField header="Label" id="LABEL" data-type="string">
-	<DisplayFieldElement name="Field1" schema-element="xnat:ecgSessionData.ID"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:ecgSessionData.label"/>
-	<Content type="sql">COALESCE(@Field2, @Field1)</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:ecgSessionData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:ecgSessionData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:ecgSessionData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:ecgSessionData/search_field/xnat:ecgSessionData.ID">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:ecgSessionData','xnat:ecgSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="TITLE" value="Inserted: @Field1 (@Field2)">
-				<InsertValue id="Field1" field="INSERT_DATE"/>
-				<InsertValue id="Field2" field="INSERT_USER"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ecgSessionData.project"/>
-	</DisplayField>
-	<DisplayField id="XNAT_ECGSESSIONDATA_PROJECT_IDENTIFIER" header="XNAT_ECGSESSIONDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">xnat_ecgsessiondata_project_id</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:ecgSessionData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:ecgSessionData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:ecgSessionData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:ecgSessionData/search_field/xnat:ecgSessionData.ID/project/@Field2">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-				<InsertValue id="Field2" field="@WHERE"/>
-			</Property>
-		</HTML-Link>
-		<SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_ecgsessiondata_project_id,sharing_share_xnat_experimentda_id FROM (	SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE'	UNION 	SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:ecgSessionData.ID" queryField="sharing_share_xnat_experimentda_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ecgSessionData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ecgSessionData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayField id="XNAT_ECGSESSIONDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">field</Content>
-		<SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:ecgSessionData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:ecgSessionData.ID" queryField="expt_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="ECGSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="RPT"/>
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="ECGSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="ECGSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="EXPT_ID"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="ECGSession" dark-color="9999CC" light-color="CCCCFF">
-	</DisplayVersion>
-	<DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="ECGSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="XNAT_ECGSESSIONDATA_PROJECT_IDENTIFIER"/>
-		<DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<ViewLink alias="XNAT_ECGSESSIONDATA_PROJECTS">
-		<Mapping TableName="XNAT_ECGSESSIONDATA_PROJECTS">
-			<MappingColumn rootElement="xnat:ecgSessionData" fieldElement="xnat:ecgSessionData.ID" mapsTo="id"/>
-		</Mapping>
-	</ViewLink>
-	<SQLView name="XNAT_ECGSESSIONDATA_PROJECTS" sql="SELECT id, '&lt;' || expt.project || '&gt;' || xs_a_concat(',&lt;' || shared.project || '&gt;') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:ecgSessionData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_eegScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_eegScanData_display.xml
deleted file mode 100644
index 8a7de468..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_eegScanData_display.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:eegScanData" full-description="EEGScan" brief-description="EEGScan">
-	<DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:eegScanData/image_session_ID"/>
-	</DisplayField>
-	<DisplayField id="NOTE" header="note" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:eegScanData/note"/>
-	</DisplayField>
-	<DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:eegScanData/quality"/>
-	</DisplayField>
-	<DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:eegScanData/condition"/>
-	</DisplayField>
-	<DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:eegScanData/series_description"/>
-	</DisplayField>
-	<DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:eegScanData/documentation"/>
-	</DisplayField>
-	<DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:eegScanData/scanner"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:eegScanData/scanner/manufacturer"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:eegScanData/scanner/model"/>
-	</DisplayField>
-	<DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:eegScanData/modality"/>
-	</DisplayField>
-	<DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:eegScanData/frames"/>
-	</DisplayField>
-	<DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:eegScanData/operator"/>
-	</DisplayField>
-	<DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:eegScanData/startTime"/>
-	</DisplayField>
-	<DisplayField id="ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:eegScanData/ID"/>
-	</DisplayField>
-	<DisplayField id="TYPE" header="type" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:eegScanData/type"/>
-	</DisplayField>
-	<DisplayField id="UID" header="UID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:eegScanData/UID"/>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="project" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:eegScanData/project"/>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:eegScanData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:eegScanData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="EEGScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="EEGScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-	</DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_eegSessionData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_eegSessionData_display.xml
deleted file mode 100644
index 5a0ee7eb..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_eegSessionData_display.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:eegSessionData" full-description="EEGSession" brief-description="EEGSession">
-	<Arc name="PARTICIPANT_EXPERIMENT">
-		<CommonField id="PART_ID" local-field="SUBJECT_ID"/>
-		<CommonField id="DATE" local-field="DATE"/>
-		<CommonField id="EXPT_ID" local-field="EXPT_ID"/>
-	</Arc>
-	<DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:eegSessionData.subject_ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
-				<InsertValue id="Field1" field="SUBJECT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:eegSessionData.ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:eegSessionData','xnat:eegSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="RPT" header="ID" visible="true" image="true">
-		<Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:eegSessionData','xnat:eegSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="DATE" header="Date" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:eegSessionData.date"/>
-	</DisplayField>
-	<DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
-	<DisplayFieldElement name="Field1" schema-element="xnat:eegSessionData.date"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
-	<DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
-	<Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
-	</DisplayField>
-	<DisplayField header="Projects" id="PROJECTS" data-type="string">
-		<DisplayFieldElement name="Field1" viewName="XNAT_EEGSESSIONDATA_PROJECTS" viewColumn="PROJECTS"/>
-	</DisplayField>
-	<DisplayField header="Label" id="LABEL" data-type="string">
-	<DisplayFieldElement name="Field1" schema-element="xnat:eegSessionData.ID"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:eegSessionData.label"/>
-	<Content type="sql">COALESCE(@Field2, @Field1)</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:eegSessionData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:eegSessionData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:eegSessionData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:eegSessionData/search_field/xnat:eegSessionData.ID">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:eegSessionData','xnat:eegSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="TITLE" value="Inserted: @Field1 (@Field2)">
-				<InsertValue id="Field1" field="INSERT_DATE"/>
-				<InsertValue id="Field2" field="INSERT_USER"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:eegSessionData.project"/>
-	</DisplayField>
-	<DisplayField id="XNAT_EEGSESSIONDATA_PROJECT_IDENTIFIER" header="XNAT_EEGSESSIONDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">xnat_eegsessiondata_project_id</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:eegSessionData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:eegSessionData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:eegSessionData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:eegSessionData/search_field/xnat:eegSessionData.ID/project/@Field2">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-				<InsertValue id="Field2" field="@WHERE"/>
-			</Property>
-		</HTML-Link>
-		<SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_eegsessiondata_project_id,sharing_share_xnat_experimentda_id FROM (	SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE'	UNION 	SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:eegSessionData.ID" queryField="sharing_share_xnat_experimentda_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:eegSessionData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:eegSessionData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayField id="XNAT_EEGSESSIONDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">field</Content>
-		<SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:eegSessionData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:eegSessionData.ID" queryField="expt_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="EEGSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="RPT"/>
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="EEGSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="EEGSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="EXPT_ID"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="EEGSession" dark-color="9999CC" light-color="CCCCFF">
-	</DisplayVersion>
-	<DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="EEGSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="XNAT_EEGSESSIONDATA_PROJECT_IDENTIFIER"/>
-		<DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<ViewLink alias="XNAT_EEGSESSIONDATA_PROJECTS">
-		<Mapping TableName="XNAT_EEGSESSIONDATA_PROJECTS">
-			<MappingColumn rootElement="xnat:eegSessionData" fieldElement="xnat:eegSessionData.ID" mapsTo="id"/>
-		</Mapping>
-	</ViewLink>
-	<SQLView name="XNAT_EEGSESSIONDATA_PROJECTS" sql="SELECT id, '&lt;' || expt.project || '&gt;' || xs_a_concat(',&lt;' || shared.project || '&gt;') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:eegSessionData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_epsScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_epsScanData_display.xml
deleted file mode 100644
index d42bfa61..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_epsScanData_display.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:epsScanData" full-description="EPSScan" brief-description="EPSScan">
-	<DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:epsScanData/image_session_ID"/>
-	</DisplayField>
-	<DisplayField id="NOTE" header="note" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:epsScanData/note"/>
-	</DisplayField>
-	<DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:epsScanData/quality"/>
-	</DisplayField>
-	<DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:epsScanData/condition"/>
-	</DisplayField>
-	<DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:epsScanData/series_description"/>
-	</DisplayField>
-	<DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:epsScanData/documentation"/>
-	</DisplayField>
-	<DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:epsScanData/scanner"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:epsScanData/scanner/manufacturer"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:epsScanData/scanner/model"/>
-	</DisplayField>
-	<DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:epsScanData/modality"/>
-	</DisplayField>
-	<DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:epsScanData/frames"/>
-	</DisplayField>
-	<DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:epsScanData/operator"/>
-	</DisplayField>
-	<DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:epsScanData/startTime"/>
-	</DisplayField>
-	<DisplayField id="ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:epsScanData/ID"/>
-	</DisplayField>
-	<DisplayField id="TYPE" header="type" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:epsScanData/type"/>
-	</DisplayField>
-	<DisplayField id="UID" header="UID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:epsScanData/UID"/>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="project" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:epsScanData/project"/>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:epsScanData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:epsScanData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="EPSScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="EPSScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-	</DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_epsSessionData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_epsSessionData_display.xml
deleted file mode 100644
index 0dfb7d37..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_epsSessionData_display.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:epsSessionData" full-description="EPSSession" brief-description="EPSSession">
-	<Arc name="PARTICIPANT_EXPERIMENT">
-		<CommonField id="PART_ID" local-field="SUBJECT_ID"/>
-		<CommonField id="DATE" local-field="DATE"/>
-		<CommonField id="EXPT_ID" local-field="EXPT_ID"/>
-	</Arc>
-	<DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:epsSessionData.subject_ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
-				<InsertValue id="Field1" field="SUBJECT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:epsSessionData.ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:epsSessionData','xnat:epsSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="RPT" header="ID" visible="true" image="true">
-		<Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:epsSessionData','xnat:epsSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="DATE" header="Date" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:epsSessionData.date"/>
-	</DisplayField>
-	<DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
-	<DisplayFieldElement name="Field1" schema-element="xnat:epsSessionData.date"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
-	<DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
-	<Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
-	</DisplayField>
-	<DisplayField header="Projects" id="PROJECTS" data-type="string">
-		<DisplayFieldElement name="Field1" viewName="XNAT_EPSSESSIONDATA_PROJECTS" viewColumn="PROJECTS"/>
-	</DisplayField>
-	<DisplayField header="Label" id="LABEL" data-type="string">
-	<DisplayFieldElement name="Field1" schema-element="xnat:epsSessionData.ID"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:epsSessionData.label"/>
-	<Content type="sql">COALESCE(@Field2, @Field1)</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:epsSessionData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:epsSessionData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:epsSessionData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:epsSessionData/search_field/xnat:epsSessionData.ID">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:epsSessionData','xnat:epsSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="TITLE" value="Inserted: @Field1 (@Field2)">
-				<InsertValue id="Field1" field="INSERT_DATE"/>
-				<InsertValue id="Field2" field="INSERT_USER"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:epsSessionData.project"/>
-	</DisplayField>
-	<DisplayField id="XNAT_EPSSESSIONDATA_PROJECT_IDENTIFIER" header="XNAT_EPSSESSIONDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">xnat_epssessiondata_project_id</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:epsSessionData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:epsSessionData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:epsSessionData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:epsSessionData/search_field/xnat:epsSessionData.ID/project/@Field2">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-				<InsertValue id="Field2" field="@WHERE"/>
-			</Property>
-		</HTML-Link>
-		<SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_epssessiondata_project_id,sharing_share_xnat_experimentda_id FROM (	SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE'	UNION 	SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:epsSessionData.ID" queryField="sharing_share_xnat_experimentda_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:epsSessionData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:epsSessionData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayField id="XNAT_EPSSESSIONDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">field</Content>
-		<SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:epsSessionData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:epsSessionData.ID" queryField="expt_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="EPSSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="RPT"/>
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="EPSSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="EPSSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="EXPT_ID"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="EPSSession" dark-color="9999CC" light-color="CCCCFF">
-	</DisplayVersion>
-	<DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="EPSSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="XNAT_EPSSESSIONDATA_PROJECT_IDENTIFIER"/>
-		<DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<ViewLink alias="XNAT_EPSSESSIONDATA_PROJECTS">
-		<Mapping TableName="XNAT_EPSSESSIONDATA_PROJECTS">
-			<MappingColumn rootElement="xnat:epsSessionData" fieldElement="xnat:epsSessionData.ID" mapsTo="id"/>
-		</Mapping>
-	</ViewLink>
-	<SQLView name="XNAT_EPSSESSIONDATA_PROJECTS" sql="SELECT id, '&lt;' || expt.project || '&gt;' || xs_a_concat(',&lt;' || shared.project || '&gt;') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:epsSessionData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_esScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_esScanData_display.xml
deleted file mode 100644
index eec9f8b5..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_esScanData_display.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:esScanData" full-description="ESScan" brief-description="ESScan">
-	<DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:esScanData/image_session_ID"/>
-	</DisplayField>
-	<DisplayField id="NOTE" header="note" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:esScanData/note"/>
-	</DisplayField>
-	<DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:esScanData/quality"/>
-	</DisplayField>
-	<DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:esScanData/condition"/>
-	</DisplayField>
-	<DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:esScanData/series_description"/>
-	</DisplayField>
-	<DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:esScanData/documentation"/>
-	</DisplayField>
-	<DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:esScanData/scanner"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:esScanData/scanner/manufacturer"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:esScanData/scanner/model"/>
-	</DisplayField>
-	<DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:esScanData/modality"/>
-	</DisplayField>
-	<DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:esScanData/frames"/>
-	</DisplayField>
-	<DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:esScanData/operator"/>
-	</DisplayField>
-	<DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:esScanData/startTime"/>
-	</DisplayField>
-	<DisplayField id="ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:esScanData/ID"/>
-	</DisplayField>
-	<DisplayField id="TYPE" header="type" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:esScanData/type"/>
-	</DisplayField>
-	<DisplayField id="UID" header="UID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:esScanData/UID"/>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="project" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:esScanData/project"/>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:esScanData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:esScanData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="ESScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="ESScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-	</DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_esSessionData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_esSessionData_display.xml
deleted file mode 100644
index 36fb337d..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_esSessionData_display.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:esSessionData" full-description="ESSession" brief-description="ESSession">
-	<Arc name="PARTICIPANT_EXPERIMENT">
-		<CommonField id="PART_ID" local-field="SUBJECT_ID"/>
-		<CommonField id="DATE" local-field="DATE"/>
-		<CommonField id="EXPT_ID" local-field="EXPT_ID"/>
-	</Arc>
-	<DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:esSessionData.subject_ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
-				<InsertValue id="Field1" field="SUBJECT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:esSessionData.ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:esSessionData','xnat:esSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="RPT" header="ID" visible="true" image="true">
-		<Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:esSessionData','xnat:esSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="DATE" header="Date" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:esSessionData.date"/>
-	</DisplayField>
-	<DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
-	<DisplayFieldElement name="Field1" schema-element="xnat:esSessionData.date"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
-	<DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
-	<Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
-	</DisplayField>
-	<DisplayField header="Projects" id="PROJECTS" data-type="string">
-		<DisplayFieldElement name="Field1" viewName="XNAT_ESSESSIONDATA_PROJECTS" viewColumn="PROJECTS"/>
-	</DisplayField>
-	<DisplayField header="Label" id="LABEL" data-type="string">
-	<DisplayFieldElement name="Field1" schema-element="xnat:esSessionData.ID"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:esSessionData.label"/>
-	<Content type="sql">COALESCE(@Field2, @Field1)</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:esSessionData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:esSessionData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:esSessionData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:esSessionData/search_field/xnat:esSessionData.ID">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:esSessionData','xnat:esSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="TITLE" value="Inserted: @Field1 (@Field2)">
-				<InsertValue id="Field1" field="INSERT_DATE"/>
-				<InsertValue id="Field2" field="INSERT_USER"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:esSessionData.project"/>
-	</DisplayField>
-	<DisplayField id="XNAT_ESSESSIONDATA_PROJECT_IDENTIFIER" header="XNAT_ESSESSIONDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">xnat_essessiondata_project_id</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:esSessionData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:esSessionData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:esSessionData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:esSessionData/search_field/xnat:esSessionData.ID/project/@Field2">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-				<InsertValue id="Field2" field="@WHERE"/>
-			</Property>
-		</HTML-Link>
-		<SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_essessiondata_project_id,sharing_share_xnat_experimentda_id FROM (	SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE'	UNION 	SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:esSessionData.ID" queryField="sharing_share_xnat_experimentda_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:esSessionData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:esSessionData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayField id="XNAT_ESSESSIONDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">field</Content>
-		<SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:esSessionData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:esSessionData.ID" queryField="expt_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="ESSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="RPT"/>
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="ESSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="ESSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="EXPT_ID"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="ESSession" dark-color="9999CC" light-color="CCCCFF">
-	</DisplayVersion>
-	<DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="ESSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="XNAT_ESSESSIONDATA_PROJECT_IDENTIFIER"/>
-		<DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<ViewLink alias="XNAT_ESSESSIONDATA_PROJECTS">
-		<Mapping TableName="XNAT_ESSESSIONDATA_PROJECTS">
-			<MappingColumn rootElement="xnat:esSessionData" fieldElement="xnat:esSessionData.ID" mapsTo="id"/>
-		</Mapping>
-	</ViewLink>
-	<SQLView name="XNAT_ESSESSIONDATA_PROJECTS" sql="SELECT id, '&lt;' || expt.project || '&gt;' || xs_a_concat(',&lt;' || shared.project || '&gt;') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:esSessionData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_esvScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_esvScanData_display.xml
deleted file mode 100644
index dd5ba844..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_esvScanData_display.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:esvScanData" full-description="ESVScan" brief-description="ESVScan">
-	<DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:esvScanData/image_session_ID"/>
-	</DisplayField>
-	<DisplayField id="NOTE" header="note" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:esvScanData/note"/>
-	</DisplayField>
-	<DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:esvScanData/quality"/>
-	</DisplayField>
-	<DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:esvScanData/condition"/>
-	</DisplayField>
-	<DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:esvScanData/series_description"/>
-	</DisplayField>
-	<DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:esvScanData/documentation"/>
-	</DisplayField>
-	<DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:esvScanData/scanner"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:esvScanData/scanner/manufacturer"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:esvScanData/scanner/model"/>
-	</DisplayField>
-	<DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:esvScanData/modality"/>
-	</DisplayField>
-	<DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:esvScanData/frames"/>
-	</DisplayField>
-	<DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:esvScanData/operator"/>
-	</DisplayField>
-	<DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:esvScanData/startTime"/>
-	</DisplayField>
-	<DisplayField id="ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:esvScanData/ID"/>
-	</DisplayField>
-	<DisplayField id="TYPE" header="type" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:esvScanData/type"/>
-	</DisplayField>
-	<DisplayField id="UID" header="UID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:esvScanData/UID"/>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="project" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:esvScanData/project"/>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:esvScanData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:esvScanData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="ESVScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="ESVScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-	</DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_esvSessionData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_esvSessionData_display.xml
deleted file mode 100644
index 7a6e39e6..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_esvSessionData_display.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:esvSessionData" full-description="ESVSession" brief-description="ESVSession">
-	<Arc name="PARTICIPANT_EXPERIMENT">
-		<CommonField id="PART_ID" local-field="SUBJECT_ID"/>
-		<CommonField id="DATE" local-field="DATE"/>
-		<CommonField id="EXPT_ID" local-field="EXPT_ID"/>
-	</Arc>
-	<DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:esvSessionData.subject_ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
-				<InsertValue id="Field1" field="SUBJECT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:esvSessionData.ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:esvSessionData','xnat:esvSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="RPT" header="ID" visible="true" image="true">
-		<Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:esvSessionData','xnat:esvSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="DATE" header="Date" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:esvSessionData.date"/>
-	</DisplayField>
-	<DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
-	<DisplayFieldElement name="Field1" schema-element="xnat:esvSessionData.date"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
-	<DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
-	<Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
-	</DisplayField>
-	<DisplayField header="Projects" id="PROJECTS" data-type="string">
-		<DisplayFieldElement name="Field1" viewName="XNAT_ESVSESSIONDATA_PROJECTS" viewColumn="PROJECTS"/>
-	</DisplayField>
-	<DisplayField header="Label" id="LABEL" data-type="string">
-	<DisplayFieldElement name="Field1" schema-element="xnat:esvSessionData.ID"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:esvSessionData.label"/>
-	<Content type="sql">COALESCE(@Field2, @Field1)</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:esvSessionData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:esvSessionData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:esvSessionData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:esvSessionData/search_field/xnat:esvSessionData.ID">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:esvSessionData','xnat:esvSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="TITLE" value="Inserted: @Field1 (@Field2)">
-				<InsertValue id="Field1" field="INSERT_DATE"/>
-				<InsertValue id="Field2" field="INSERT_USER"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:esvSessionData.project"/>
-	</DisplayField>
-	<DisplayField id="XNAT_ESVSESSIONDATA_PROJECT_IDENTIFIER" header="XNAT_ESVSESSIONDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">xnat_esvsessiondata_project_id</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:esvSessionData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:esvSessionData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:esvSessionData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:esvSessionData/search_field/xnat:esvSessionData.ID/project/@Field2">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-				<InsertValue id="Field2" field="@WHERE"/>
-			</Property>
-		</HTML-Link>
-		<SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_esvsessiondata_project_id,sharing_share_xnat_experimentda_id FROM (	SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE'	UNION 	SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:esvSessionData.ID" queryField="sharing_share_xnat_experimentda_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:esvSessionData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:esvSessionData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayField id="XNAT_ESVSESSIONDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">field</Content>
-		<SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:esvSessionData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:esvSessionData.ID" queryField="expt_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="ESVSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="RPT"/>
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="ESVSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="ESVSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="EXPT_ID"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="ESVSession" dark-color="9999CC" light-color="CCCCFF">
-	</DisplayVersion>
-	<DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="ESVSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="XNAT_ESVSESSIONDATA_PROJECT_IDENTIFIER"/>
-		<DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<ViewLink alias="XNAT_ESVSESSIONDATA_PROJECTS">
-		<Mapping TableName="XNAT_ESVSESSIONDATA_PROJECTS">
-			<MappingColumn rootElement="xnat:esvSessionData" fieldElement="xnat:esvSessionData.ID" mapsTo="id"/>
-		</Mapping>
-	</ViewLink>
-	<SQLView name="XNAT_ESVSESSIONDATA_PROJECTS" sql="SELECT id, '&lt;' || expt.project || '&gt;' || xs_a_concat(',&lt;' || shared.project || '&gt;') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:esvSessionData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_fieldDefinitionGroup_display.xml b/src/main/webapp/schemas/xnat/display/xnat_fieldDefinitionGroup_display.xml
deleted file mode 100644
index d31914f9..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_fieldDefinitionGroup_display.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:fieldDefinitionGroup" full-description="FieldDefinitionSet" brief-description="FieldDefinitionSet">
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:fieldDefinitionGroup.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:fieldDefinitionGroup.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayField id="ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:fieldDefinitionGroup/ID"/>
-	</DisplayField>
-	<DisplayField id="DATA_TYPE" header="data-type" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:fieldDefinitionGroup/data-type"/>
-	</DisplayField>
-	<DisplayField id="DESCRIPTION" header="description" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:fieldDefinitionGroup/description"/>
-	</DisplayField>
-	<DisplayField id="SHAREABLE" header="shareable" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:fieldDefinitionGroup/shareable"/>
-	</DisplayField>
-	<DisplayField id="PROJECT_SPECIFIC" header="project-specific" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:fieldDefinitionGroup/project-specific"/>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="ID" default-sort-order="DESC" brief-description="FieldDefinitionSet" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="DATA_TYPE"/>
-		<DisplayFieldRef id="DESCRIPTION"/>
-		<DisplayFieldRef id="SHAREABLE"/>
-		<DisplayFieldRef id="PROJECT_SPECIFIC"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="ID" default-sort-order="DESC" brief-description="FieldDefinitionSet" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="DATA_TYPE"/>
-		<DisplayFieldRef id="DESCRIPTION"/>
-		<DisplayFieldRef id="SHAREABLE"/>
-		<DisplayFieldRef id="PROJECT_SPECIFIC"/>
-	</DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_genericData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_genericData_display.xml
deleted file mode 100644
index ae85fbc8..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_genericData_display.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:genericData" full-description="Generic" brief-description="Generic">
-	<DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:genericData.ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:genericData','xnat:genericData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="RPT" header="ID" visible="true" image="true">
-		<Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:genericData','xnat:genericData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="DATE" header="Date" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:genericData.date"/>
-	</DisplayField>
-	<DisplayField header="Projects" id="PROJECTS" data-type="string">
-		<DisplayFieldElement name="Field1" viewName="XNAT_GENERICDATA_PROJECTS" viewColumn="PROJECTS"/>
-	</DisplayField>
-	<DisplayField header="Label" id="LABEL" data-type="string">
-	<DisplayFieldElement name="Field1" schema-element="xnat:genericData.ID"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:genericData.label"/>
-	<Content type="sql">COALESCE(@Field2, @Field1)</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:genericData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:genericData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:genericData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:genericData/search_field/xnat:genericData.ID">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:genericData','xnat:genericData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="TITLE" value="Inserted: @Field1 (@Field2)">
-				<InsertValue id="Field1" field="INSERT_DATE"/>
-				<InsertValue id="Field2" field="INSERT_USER"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:genericData.project"/>
-	</DisplayField>
-	<DisplayField id="XNAT_GENERICDATA_PROJECT_IDENTIFIER" header="XNAT_GENERICDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">xnat_genericdata_project_id</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:genericData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:genericData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:genericData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:genericData/search_field/xnat:genericData.ID/project/@Field2">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-				<InsertValue id="Field2" field="@WHERE"/>
-			</Property>
-		</HTML-Link>
-		<SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_genericdata_project_id,sharing_share_xnat_experimentda_id FROM (	SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE'	UNION 	SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:genericData.ID" queryField="sharing_share_xnat_experimentda_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:genericData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:genericData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayField id="XNAT_GENERICDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">field</Content>
-		<SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:genericData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:genericData.ID" queryField="expt_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="Generic" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="RPT"/>
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="DATE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="Generic" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="DATE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="Generic" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="EXPT_ID"/>
-		<DisplayFieldRef id="DATE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="Generic" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="EXPT_ID"/>
-		<DisplayFieldRef id="DATE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="Generic" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="XNAT_GENERICDATA_PROJECT_IDENTIFIER"/>
-		<DisplayFieldRef id="DATE"/>
-	</DisplayVersion>
-	<ViewLink alias="XNAT_GENERICDATA_PROJECTS">
-		<Mapping TableName="XNAT_GENERICDATA_PROJECTS">
-			<MappingColumn rootElement="xnat:genericData" fieldElement="xnat:genericData.ID" mapsTo="id"/>
-		</Mapping>
-	</ViewLink>
-	<SQLView name="XNAT_GENERICDATA_PROJECTS" sql="SELECT id, '&lt;' || expt.project || '&gt;' || xs_a_concat(',&lt;' || shared.project || '&gt;') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:genericData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_gmScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_gmScanData_display.xml
deleted file mode 100644
index cf05627c..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_gmScanData_display.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:gmScanData" full-description="GMScan" brief-description="GMScan">
-	<DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:gmScanData/image_session_ID"/>
-	</DisplayField>
-	<DisplayField id="NOTE" header="note" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:gmScanData/note"/>
-	</DisplayField>
-	<DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:gmScanData/quality"/>
-	</DisplayField>
-	<DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:gmScanData/condition"/>
-	</DisplayField>
-	<DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:gmScanData/series_description"/>
-	</DisplayField>
-	<DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:gmScanData/documentation"/>
-	</DisplayField>
-	<DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:gmScanData/scanner"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:gmScanData/scanner/manufacturer"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:gmScanData/scanner/model"/>
-	</DisplayField>
-	<DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:gmScanData/modality"/>
-	</DisplayField>
-	<DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:gmScanData/frames"/>
-	</DisplayField>
-	<DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:gmScanData/operator"/>
-	</DisplayField>
-	<DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:gmScanData/startTime"/>
-	</DisplayField>
-	<DisplayField id="ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:gmScanData/ID"/>
-	</DisplayField>
-	<DisplayField id="TYPE" header="type" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:gmScanData/type"/>
-	</DisplayField>
-	<DisplayField id="UID" header="UID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:gmScanData/UID"/>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="project" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:gmScanData/project"/>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:gmScanData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:gmScanData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="GMScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="GMScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-	</DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_gmSessionData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_gmSessionData_display.xml
deleted file mode 100644
index 1f08f32b..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_gmSessionData_display.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:gmSessionData" full-description="GMSession" brief-description="GMSession">
-	<Arc name="PARTICIPANT_EXPERIMENT">
-		<CommonField id="PART_ID" local-field="SUBJECT_ID"/>
-		<CommonField id="DATE" local-field="DATE"/>
-		<CommonField id="EXPT_ID" local-field="EXPT_ID"/>
-	</Arc>
-	<DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:gmSessionData.subject_ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
-				<InsertValue id="Field1" field="SUBJECT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:gmSessionData.ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:gmSessionData','xnat:gmSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="RPT" header="ID" visible="true" image="true">
-		<Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:gmSessionData','xnat:gmSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="DATE" header="Date" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:gmSessionData.date"/>
-	</DisplayField>
-	<DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
-	<DisplayFieldElement name="Field1" schema-element="xnat:gmSessionData.date"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
-	<DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
-	<Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
-	</DisplayField>
-	<DisplayField header="Projects" id="PROJECTS" data-type="string">
-		<DisplayFieldElement name="Field1" viewName="XNAT_GMSESSIONDATA_PROJECTS" viewColumn="PROJECTS"/>
-	</DisplayField>
-	<DisplayField header="Label" id="LABEL" data-type="string">
-	<DisplayFieldElement name="Field1" schema-element="xnat:gmSessionData.ID"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:gmSessionData.label"/>
-	<Content type="sql">COALESCE(@Field2, @Field1)</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:gmSessionData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:gmSessionData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:gmSessionData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:gmSessionData/search_field/xnat:gmSessionData.ID">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:gmSessionData','xnat:gmSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="TITLE" value="Inserted: @Field1 (@Field2)">
-				<InsertValue id="Field1" field="INSERT_DATE"/>
-				<InsertValue id="Field2" field="INSERT_USER"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:gmSessionData.project"/>
-	</DisplayField>
-	<DisplayField id="XNAT_GMSESSIONDATA_PROJECT_IDENTIFIER" header="XNAT_GMSESSIONDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">xnat_gmsessiondata_project_id</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:gmSessionData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:gmSessionData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:gmSessionData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:gmSessionData/search_field/xnat:gmSessionData.ID/project/@Field2">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-				<InsertValue id="Field2" field="@WHERE"/>
-			</Property>
-		</HTML-Link>
-		<SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_gmsessiondata_project_id,sharing_share_xnat_experimentda_id FROM (	SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE'	UNION 	SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:gmSessionData.ID" queryField="sharing_share_xnat_experimentda_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:gmSessionData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:gmSessionData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayField id="XNAT_GMSESSIONDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">field</Content>
-		<SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:gmSessionData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:gmSessionData.ID" queryField="expt_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="GMSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="RPT"/>
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="GMSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="GMSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="EXPT_ID"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="GMSession" dark-color="9999CC" light-color="CCCCFF">
-	</DisplayVersion>
-	<DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="GMSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="XNAT_GMSESSIONDATA_PROJECT_IDENTIFIER"/>
-		<DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<ViewLink alias="XNAT_GMSESSIONDATA_PROJECTS">
-		<Mapping TableName="XNAT_GMSESSIONDATA_PROJECTS">
-			<MappingColumn rootElement="xnat:gmSessionData" fieldElement="xnat:gmSessionData.ID" mapsTo="id"/>
-		</Mapping>
-	</ViewLink>
-	<SQLView name="XNAT_GMSESSIONDATA_PROJECTS" sql="SELECT id, '&lt;' || expt.project || '&gt;' || xs_a_concat(',&lt;' || shared.project || '&gt;') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:gmSessionData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_gmvScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_gmvScanData_display.xml
deleted file mode 100644
index b56d831b..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_gmvScanData_display.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:gmvScanData" full-description="GMVScan" brief-description="GMVScan">
-	<DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:gmvScanData/image_session_ID"/>
-	</DisplayField>
-	<DisplayField id="NOTE" header="note" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:gmvScanData/note"/>
-	</DisplayField>
-	<DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:gmvScanData/quality"/>
-	</DisplayField>
-	<DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:gmvScanData/condition"/>
-	</DisplayField>
-	<DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:gmvScanData/series_description"/>
-	</DisplayField>
-	<DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:gmvScanData/documentation"/>
-	</DisplayField>
-	<DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:gmvScanData/scanner"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:gmvScanData/scanner/manufacturer"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:gmvScanData/scanner/model"/>
-	</DisplayField>
-	<DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:gmvScanData/modality"/>
-	</DisplayField>
-	<DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:gmvScanData/frames"/>
-	</DisplayField>
-	<DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:gmvScanData/operator"/>
-	</DisplayField>
-	<DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:gmvScanData/startTime"/>
-	</DisplayField>
-	<DisplayField id="ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:gmvScanData/ID"/>
-	</DisplayField>
-	<DisplayField id="TYPE" header="type" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:gmvScanData/type"/>
-	</DisplayField>
-	<DisplayField id="UID" header="UID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:gmvScanData/UID"/>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="project" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:gmvScanData/project"/>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:gmvScanData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:gmvScanData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="GMVScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="GMVScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-	</DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_gmvSessionData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_gmvSessionData_display.xml
deleted file mode 100644
index 099be6ce..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_gmvSessionData_display.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:gmvSessionData" full-description="GMVSession" brief-description="GMVSession">
-	<Arc name="PARTICIPANT_EXPERIMENT">
-		<CommonField id="PART_ID" local-field="SUBJECT_ID"/>
-		<CommonField id="DATE" local-field="DATE"/>
-		<CommonField id="EXPT_ID" local-field="EXPT_ID"/>
-	</Arc>
-	<DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:gmvSessionData.subject_ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
-				<InsertValue id="Field1" field="SUBJECT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:gmvSessionData.ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:gmvSessionData','xnat:gmvSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="RPT" header="ID" visible="true" image="true">
-		<Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:gmvSessionData','xnat:gmvSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="DATE" header="Date" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:gmvSessionData.date"/>
-	</DisplayField>
-	<DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
-	<DisplayFieldElement name="Field1" schema-element="xnat:gmvSessionData.date"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
-	<DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
-	<Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
-	</DisplayField>
-	<DisplayField header="Projects" id="PROJECTS" data-type="string">
-		<DisplayFieldElement name="Field1" viewName="XNAT_GMVSESSIONDATA_PROJECTS" viewColumn="PROJECTS"/>
-	</DisplayField>
-	<DisplayField header="Label" id="LABEL" data-type="string">
-	<DisplayFieldElement name="Field1" schema-element="xnat:gmvSessionData.ID"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:gmvSessionData.label"/>
-	<Content type="sql">COALESCE(@Field2, @Field1)</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:gmvSessionData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:gmvSessionData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:gmvSessionData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:gmvSessionData/search_field/xnat:gmvSessionData.ID">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:gmvSessionData','xnat:gmvSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="TITLE" value="Inserted: @Field1 (@Field2)">
-				<InsertValue id="Field1" field="INSERT_DATE"/>
-				<InsertValue id="Field2" field="INSERT_USER"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:gmvSessionData.project"/>
-	</DisplayField>
-	<DisplayField id="XNAT_GMVSESSIONDATA_PROJECT_IDENTIFIER" header="XNAT_GMVSESSIONDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">xnat_gmvsessiondata_project_id</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:gmvSessionData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:gmvSessionData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:gmvSessionData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:gmvSessionData/search_field/xnat:gmvSessionData.ID/project/@Field2">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-				<InsertValue id="Field2" field="@WHERE"/>
-			</Property>
-		</HTML-Link>
-		<SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_gmvsessiondata_project_id,sharing_share_xnat_experimentda_id FROM (	SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE'	UNION 	SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:gmvSessionData.ID" queryField="sharing_share_xnat_experimentda_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:gmvSessionData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:gmvSessionData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayField id="XNAT_GMVSESSIONDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">field</Content>
-		<SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:gmvSessionData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:gmvSessionData.ID" queryField="expt_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="GMVSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="RPT"/>
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="GMVSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="GMVSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="EXPT_ID"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="GMVSession" dark-color="9999CC" light-color="CCCCFF">
-	</DisplayVersion>
-	<DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="GMVSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="XNAT_GMVSESSIONDATA_PROJECT_IDENTIFIER"/>
-		<DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<ViewLink alias="XNAT_GMVSESSIONDATA_PROJECTS">
-		<Mapping TableName="XNAT_GMVSESSIONDATA_PROJECTS">
-			<MappingColumn rootElement="xnat:gmvSessionData" fieldElement="xnat:gmvSessionData.ID" mapsTo="id"/>
-		</Mapping>
-	</ViewLink>
-	<SQLView name="XNAT_GMVSESSIONDATA_PROJECTS" sql="SELECT id, '&lt;' || expt.project || '&gt;' || xs_a_concat(',&lt;' || shared.project || '&gt;') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:gmvSessionData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_hdScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_hdScanData_display.xml
deleted file mode 100644
index c24f7855..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_hdScanData_display.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:hdScanData" full-description="HDScan" brief-description="HDScan">
-	<DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:hdScanData/image_session_ID"/>
-	</DisplayField>
-	<DisplayField id="NOTE" header="note" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:hdScanData/note"/>
-	</DisplayField>
-	<DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:hdScanData/quality"/>
-	</DisplayField>
-	<DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:hdScanData/condition"/>
-	</DisplayField>
-	<DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:hdScanData/series_description"/>
-	</DisplayField>
-	<DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:hdScanData/documentation"/>
-	</DisplayField>
-	<DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:hdScanData/scanner"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:hdScanData/scanner/manufacturer"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:hdScanData/scanner/model"/>
-	</DisplayField>
-	<DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:hdScanData/modality"/>
-	</DisplayField>
-	<DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:hdScanData/frames"/>
-	</DisplayField>
-	<DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:hdScanData/operator"/>
-	</DisplayField>
-	<DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:hdScanData/startTime"/>
-	</DisplayField>
-	<DisplayField id="ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:hdScanData/ID"/>
-	</DisplayField>
-	<DisplayField id="TYPE" header="type" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:hdScanData/type"/>
-	</DisplayField>
-	<DisplayField id="UID" header="UID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:hdScanData/UID"/>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="project" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:hdScanData/project"/>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:hdScanData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:hdScanData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="HDScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="HDScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-	</DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_hdSessionData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_hdSessionData_display.xml
deleted file mode 100644
index 6f75ace8..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_hdSessionData_display.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:hdSessionData" full-description="HDSession" brief-description="HDSession">
-	<Arc name="PARTICIPANT_EXPERIMENT">
-		<CommonField id="PART_ID" local-field="SUBJECT_ID"/>
-		<CommonField id="DATE" local-field="DATE"/>
-		<CommonField id="EXPT_ID" local-field="EXPT_ID"/>
-	</Arc>
-	<DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:hdSessionData.subject_ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
-				<InsertValue id="Field1" field="SUBJECT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:hdSessionData.ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:hdSessionData','xnat:hdSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="RPT" header="ID" visible="true" image="true">
-		<Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:hdSessionData','xnat:hdSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="DATE" header="Date" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:hdSessionData.date"/>
-	</DisplayField>
-	<DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
-	<DisplayFieldElement name="Field1" schema-element="xnat:hdSessionData.date"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
-	<DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
-	<Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
-	</DisplayField>
-	<DisplayField header="Projects" id="PROJECTS" data-type="string">
-		<DisplayFieldElement name="Field1" viewName="XNAT_HDSESSIONDATA_PROJECTS" viewColumn="PROJECTS"/>
-	</DisplayField>
-	<DisplayField header="Label" id="LABEL" data-type="string">
-	<DisplayFieldElement name="Field1" schema-element="xnat:hdSessionData.ID"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:hdSessionData.label"/>
-	<Content type="sql">COALESCE(@Field2, @Field1)</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:hdSessionData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:hdSessionData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:hdSessionData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:hdSessionData/search_field/xnat:hdSessionData.ID">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:hdSessionData','xnat:hdSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="TITLE" value="Inserted: @Field1 (@Field2)">
-				<InsertValue id="Field1" field="INSERT_DATE"/>
-				<InsertValue id="Field2" field="INSERT_USER"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:hdSessionData.project"/>
-	</DisplayField>
-	<DisplayField id="XNAT_HDSESSIONDATA_PROJECT_IDENTIFIER" header="XNAT_HDSESSIONDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">xnat_hdsessiondata_project_id</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:hdSessionData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:hdSessionData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:hdSessionData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:hdSessionData/search_field/xnat:hdSessionData.ID/project/@Field2">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-				<InsertValue id="Field2" field="@WHERE"/>
-			</Property>
-		</HTML-Link>
-		<SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_hdsessiondata_project_id,sharing_share_xnat_experimentda_id FROM (	SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE'	UNION 	SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:hdSessionData.ID" queryField="sharing_share_xnat_experimentda_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:hdSessionData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:hdSessionData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayField id="XNAT_HDSESSIONDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">field</Content>
-		<SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:hdSessionData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:hdSessionData.ID" queryField="expt_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="HDSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="RPT"/>
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="HDSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="HDSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="EXPT_ID"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="HDSession" dark-color="9999CC" light-color="CCCCFF">
-	</DisplayVersion>
-	<DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="HDSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="XNAT_HDSESSIONDATA_PROJECT_IDENTIFIER"/>
-		<DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<ViewLink alias="XNAT_HDSESSIONDATA_PROJECTS">
-		<Mapping TableName="XNAT_HDSESSIONDATA_PROJECTS">
-			<MappingColumn rootElement="xnat:hdSessionData" fieldElement="xnat:hdSessionData.ID" mapsTo="id"/>
-		</Mapping>
-	</ViewLink>
-	<SQLView name="XNAT_HDSESSIONDATA_PROJECTS" sql="SELECT id, '&lt;' || expt.project || '&gt;' || xs_a_concat(',&lt;' || shared.project || '&gt;') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:hdSessionData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_investigatorData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_investigatorData_display.xml
deleted file mode 100644
index a826f764..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_investigatorData_display.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!--Sample XML file generated by XMLSPY v2004 rel. 3 U (http://www.xmlspy.com)-->
<Displays schema-element="xnat:investigatorData" value_field="INVESTIGATOR_ID" display_field="INVESTIGATOR_NAME" display_label="Investigator" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd">
	<DisplayField id="INVESTIGATOR_ID" header="Investigator Id" visible="true">
		<DisplayFieldElement name="Field1" schema-element="xnat:investigatorData.xnat_investigatorData_id"/>
	</DisplayField>
	<DisplayField id="RPT" header="" visible="true" image="true">
		<Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
		<HTML-Link>
			<Property name="HREF" value="none"/>
			<Property name="ONCLICK" value="return rpt('@Field1','xnat:investigatorData','xnat:investigatorData.xnat_investigatorData_id');">
				<InsertValue id="Field1" field="INVESTIGATOR_ID"/>
			</Property>
		</HTML-Link>
	</DisplayField>
	<DisplayField id="INVESTIGATOR_NAME" header="Name" visible="true">
		<DisplayFieldElement name="Field2" schema-element="xnat:investigatorData.firstname"/>
		<DisplayFieldElement name="Field3" schema-element="xnat:investigatorData.lastname"/>
		<Content type="sql">@Field2 || ' ' || @Field3</Content>
	</DisplayField>
	<DisplayField id="EMAIL" header="Email" visible="true">
		<DisplayFieldElement name="Field1" schema-element="xnat:investigatorData.email"/>
	</DisplayField>
	<DisplayField id="PHONE" header="Phone" visible="true">
		<DisplayFieldElement name="Field1" schema-element="xnat:investigatorData.phone"/>
	</DisplayField>
	<DisplayVersion versionName="listing" default-order-by="INVESTIGATOR_ID" brief-description="Investigator" dark-color="99FF99" light-color="CCFFCC">
		<DisplayFieldRef id="RPT"/>
		<DisplayFieldRef id="INVESTIGATOR_ID"/>
		<DisplayFieldRef id="INVESTIGATOR_NAME"/>
		<DisplayFieldRef id="EMAIL"/>
		<DisplayFieldRef id="PHONE"/>
	</DisplayVersion>
</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_ioScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_ioScanData_display.xml
deleted file mode 100644
index 5f78b458..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_ioScanData_display.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:ioScanData" full-description="IOScan" brief-description="IOScan">
-	<DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ioScanData/image_session_ID"/>
-	</DisplayField>
-	<DisplayField id="NOTE" header="note" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ioScanData/note"/>
-	</DisplayField>
-	<DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ioScanData/quality"/>
-	</DisplayField>
-	<DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ioScanData/condition"/>
-	</DisplayField>
-	<DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ioScanData/series_description"/>
-	</DisplayField>
-	<DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ioScanData/documentation"/>
-	</DisplayField>
-	<DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ioScanData/scanner"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ioScanData/scanner/manufacturer"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ioScanData/scanner/model"/>
-	</DisplayField>
-	<DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ioScanData/modality"/>
-	</DisplayField>
-	<DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ioScanData/frames"/>
-	</DisplayField>
-	<DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ioScanData/operator"/>
-	</DisplayField>
-	<DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ioScanData/startTime"/>
-	</DisplayField>
-	<DisplayField id="ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ioScanData/ID"/>
-	</DisplayField>
-	<DisplayField id="TYPE" header="type" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ioScanData/type"/>
-	</DisplayField>
-	<DisplayField id="UID" header="UID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ioScanData/UID"/>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="project" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ioScanData/project"/>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ioScanData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ioScanData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="IOScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="IOScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-	</DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_ioSessionData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_ioSessionData_display.xml
deleted file mode 100644
index 0327b276..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_ioSessionData_display.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:ioSessionData" full-description="IOSession" brief-description="IOSession">
-	<Arc name="PARTICIPANT_EXPERIMENT">
-		<CommonField id="PART_ID" local-field="SUBJECT_ID"/>
-		<CommonField id="DATE" local-field="DATE"/>
-		<CommonField id="EXPT_ID" local-field="EXPT_ID"/>
-	</Arc>
-	<DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ioSessionData.subject_ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
-				<InsertValue id="Field1" field="SUBJECT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ioSessionData.ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:ioSessionData','xnat:ioSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="RPT" header="ID" visible="true" image="true">
-		<Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:ioSessionData','xnat:ioSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="DATE" header="Date" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ioSessionData.date"/>
-	</DisplayField>
-	<DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
-	<DisplayFieldElement name="Field1" schema-element="xnat:ioSessionData.date"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
-	<DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
-	<Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
-	</DisplayField>
-	<DisplayField header="Projects" id="PROJECTS" data-type="string">
-		<DisplayFieldElement name="Field1" viewName="XNAT_IOSESSIONDATA_PROJECTS" viewColumn="PROJECTS"/>
-	</DisplayField>
-	<DisplayField header="Label" id="LABEL" data-type="string">
-	<DisplayFieldElement name="Field1" schema-element="xnat:ioSessionData.ID"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:ioSessionData.label"/>
-	<Content type="sql">COALESCE(@Field2, @Field1)</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:ioSessionData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:ioSessionData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:ioSessionData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:ioSessionData/search_field/xnat:ioSessionData.ID">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:ioSessionData','xnat:ioSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="TITLE" value="Inserted: @Field1 (@Field2)">
-				<InsertValue id="Field1" field="INSERT_DATE"/>
-				<InsertValue id="Field2" field="INSERT_USER"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ioSessionData.project"/>
-	</DisplayField>
-	<DisplayField id="XNAT_IOSESSIONDATA_PROJECT_IDENTIFIER" header="XNAT_IOSESSIONDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">xnat_iosessiondata_project_id</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:ioSessionData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:ioSessionData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:ioSessionData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:ioSessionData/search_field/xnat:ioSessionData.ID/project/@Field2">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-				<InsertValue id="Field2" field="@WHERE"/>
-			</Property>
-		</HTML-Link>
-		<SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_iosessiondata_project_id,sharing_share_xnat_experimentda_id FROM (	SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE'	UNION 	SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:ioSessionData.ID" queryField="sharing_share_xnat_experimentda_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ioSessionData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:ioSessionData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayField id="XNAT_IOSESSIONDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">field</Content>
-		<SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:ioSessionData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:ioSessionData.ID" queryField="expt_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="IOSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="RPT"/>
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="IOSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="IOSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="EXPT_ID"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="IOSession" dark-color="9999CC" light-color="CCCCFF">
-	</DisplayVersion>
-	<DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="IOSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="XNAT_IOSESSIONDATA_PROJECT_IDENTIFIER"/>
-		<DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<ViewLink alias="XNAT_IOSESSIONDATA_PROJECTS">
-		<Mapping TableName="XNAT_IOSESSIONDATA_PROJECTS">
-			<MappingColumn rootElement="xnat:ioSessionData" fieldElement="xnat:ioSessionData.ID" mapsTo="id"/>
-		</Mapping>
-	</ViewLink>
-	<SQLView name="XNAT_IOSESSIONDATA_PROJECTS" sql="SELECT id, '&lt;' || expt.project || '&gt;' || xs_a_concat(',&lt;' || shared.project || '&gt;') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:ioSessionData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_megScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_megScanData_display.xml
deleted file mode 100644
index 361420f4..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_megScanData_display.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:megScanData" full-description="MEGScan" brief-description="MEGScan">
-	<DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:megScanData/image_session_ID"/>
-	</DisplayField>
-	<DisplayField id="NOTE" header="note" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:megScanData/note"/>
-	</DisplayField>
-	<DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:megScanData/quality"/>
-	</DisplayField>
-	<DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:megScanData/condition"/>
-	</DisplayField>
-	<DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:megScanData/series_description"/>
-	</DisplayField>
-	<DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:megScanData/documentation"/>
-	</DisplayField>
-	<DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:megScanData/scanner"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:megScanData/scanner/manufacturer"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:megScanData/scanner/model"/>
-	</DisplayField>
-	<DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:megScanData/modality"/>
-	</DisplayField>
-	<DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:megScanData/frames"/>
-	</DisplayField>
-	<DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:megScanData/operator"/>
-	</DisplayField>
-	<DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:megScanData/startTime"/>
-	</DisplayField>
-	<DisplayField id="ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:megScanData/ID"/>
-	</DisplayField>
-	<DisplayField id="TYPE" header="type" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:megScanData/type"/>
-	</DisplayField>
-	<DisplayField id="UID" header="UID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:megScanData/UID"/>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="project" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:megScanData/project"/>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:megScanData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:megScanData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="MEGScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="MEGScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-	</DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_megSessionData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_megSessionData_display.xml
deleted file mode 100644
index c49663cd..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_megSessionData_display.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:megSessionData" full-description="MEGSession" brief-description="MEGSession">
-	<Arc name="PARTICIPANT_EXPERIMENT">
-		<CommonField id="PART_ID" local-field="SUBJECT_ID"/>
-		<CommonField id="DATE" local-field="DATE"/>
-		<CommonField id="EXPT_ID" local-field="EXPT_ID"/>
-	</Arc>
-	<DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:megSessionData.subject_ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
-				<InsertValue id="Field1" field="SUBJECT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:megSessionData.ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:megSessionData','xnat:megSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="RPT" header="ID" visible="true" image="true">
-		<Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:megSessionData','xnat:megSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="DATE" header="Date" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:megSessionData.date"/>
-	</DisplayField>
-	<DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
-	<DisplayFieldElement name="Field1" schema-element="xnat:megSessionData.date"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
-	<DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
-	<Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
-	</DisplayField>
-	<DisplayField header="Projects" id="PROJECTS" data-type="string">
-		<DisplayFieldElement name="Field1" viewName="XNAT_MEGSESSIONDATA_PROJECTS" viewColumn="PROJECTS"/>
-	</DisplayField>
-	<DisplayField header="Label" id="LABEL" data-type="string">
-	<DisplayFieldElement name="Field1" schema-element="xnat:megSessionData.ID"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:megSessionData.label"/>
-	<Content type="sql">COALESCE(@Field2, @Field1)</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:megSessionData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:megSessionData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:megSessionData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:megSessionData/search_field/xnat:megSessionData.ID">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:megSessionData','xnat:megSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="TITLE" value="Inserted: @Field1 (@Field2)">
-				<InsertValue id="Field1" field="INSERT_DATE"/>
-				<InsertValue id="Field2" field="INSERT_USER"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:megSessionData.project"/>
-	</DisplayField>
-	<DisplayField id="XNAT_MEGSESSIONDATA_PROJECT_IDENTIFIER" header="XNAT_MEGSESSIONDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">xnat_megsessiondata_project_id</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:megSessionData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:megSessionData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:megSessionData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:megSessionData/search_field/xnat:megSessionData.ID/project/@Field2">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-				<InsertValue id="Field2" field="@WHERE"/>
-			</Property>
-		</HTML-Link>
-		<SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_megsessiondata_project_id,sharing_share_xnat_experimentda_id FROM (	SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE'	UNION 	SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:megSessionData.ID" queryField="sharing_share_xnat_experimentda_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:megSessionData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:megSessionData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayField id="XNAT_MEGSESSIONDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">field</Content>
-		<SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:megSessionData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:megSessionData.ID" queryField="expt_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="MEGSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="RPT"/>
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="MEGSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="MEGSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="EXPT_ID"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="MEGSession" dark-color="9999CC" light-color="CCCCFF">
-	</DisplayVersion>
-	<DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="MEGSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="XNAT_MEGSESSIONDATA_PROJECT_IDENTIFIER"/>
-		<DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<ViewLink alias="XNAT_MEGSESSIONDATA_PROJECTS">
-		<Mapping TableName="XNAT_MEGSESSIONDATA_PROJECTS">
-			<MappingColumn rootElement="xnat:megSessionData" fieldElement="xnat:megSessionData.ID" mapsTo="id"/>
-		</Mapping>
-	</ViewLink>
-	<SQLView name="XNAT_MEGSESSIONDATA_PROJECTS" sql="SELECT id, '&lt;' || expt.project || '&gt;' || xs_a_concat(',&lt;' || shared.project || '&gt;') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:megSessionData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_mgScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_mgScanData_display.xml
deleted file mode 100644
index 61f9373e..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_mgScanData_display.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:mgScanData" full-description="MGScan" brief-description="MGScan">
-	<DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mgScanData/image_session_ID"/>
-	</DisplayField>
-	<DisplayField id="NOTE" header="note" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mgScanData/note"/>
-	</DisplayField>
-	<DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mgScanData/quality"/>
-	</DisplayField>
-	<DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mgScanData/condition"/>
-	</DisplayField>
-	<DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mgScanData/series_description"/>
-	</DisplayField>
-	<DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mgScanData/documentation"/>
-	</DisplayField>
-	<DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mgScanData/scanner"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mgScanData/scanner/manufacturer"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mgScanData/scanner/model"/>
-	</DisplayField>
-	<DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mgScanData/modality"/>
-	</DisplayField>
-	<DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mgScanData/frames"/>
-	</DisplayField>
-	<DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mgScanData/operator"/>
-	</DisplayField>
-	<DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mgScanData/startTime"/>
-	</DisplayField>
-	<DisplayField id="ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mgScanData/ID"/>
-	</DisplayField>
-	<DisplayField id="TYPE" header="type" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mgScanData/type"/>
-	</DisplayField>
-	<DisplayField id="UID" header="UID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mgScanData/UID"/>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="project" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mgScanData/project"/>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mgScanData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mgScanData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="MGScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="MGScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-	</DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_mgSessionData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_mgSessionData_display.xml
deleted file mode 100644
index fdde47aa..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_mgSessionData_display.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:mgSessionData" full-description="MGSession" brief-description="MGSession">
-	<Arc name="PARTICIPANT_EXPERIMENT">
-		<CommonField id="PART_ID" local-field="SUBJECT_ID"/>
-		<CommonField id="DATE" local-field="DATE"/>
-		<CommonField id="EXPT_ID" local-field="EXPT_ID"/>
-	</Arc>
-	<DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mgSessionData.subject_ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
-				<InsertValue id="Field1" field="SUBJECT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mgSessionData.ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:mgSessionData','xnat:mgSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="RPT" header="ID" visible="true" image="true">
-		<Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:mgSessionData','xnat:mgSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="DATE" header="Date" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mgSessionData.date"/>
-	</DisplayField>
-	<DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
-	<DisplayFieldElement name="Field1" schema-element="xnat:mgSessionData.date"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
-	<DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
-	<Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
-	</DisplayField>
-	<DisplayField header="Projects" id="PROJECTS" data-type="string">
-		<DisplayFieldElement name="Field1" viewName="XNAT_MGSESSIONDATA_PROJECTS" viewColumn="PROJECTS"/>
-	</DisplayField>
-	<DisplayField header="Label" id="LABEL" data-type="string">
-	<DisplayFieldElement name="Field1" schema-element="xnat:mgSessionData.ID"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:mgSessionData.label"/>
-	<Content type="sql">COALESCE(@Field2, @Field1)</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:mgSessionData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:mgSessionData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:mgSessionData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:mgSessionData/search_field/xnat:mgSessionData.ID">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:mgSessionData','xnat:mgSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="TITLE" value="Inserted: @Field1 (@Field2)">
-				<InsertValue id="Field1" field="INSERT_DATE"/>
-				<InsertValue id="Field2" field="INSERT_USER"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mgSessionData.project"/>
-	</DisplayField>
-	<DisplayField id="XNAT_MGSESSIONDATA_PROJECT_IDENTIFIER" header="XNAT_MGSESSIONDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">xnat_mgsessiondata_project_id</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:mgSessionData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:mgSessionData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:mgSessionData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:mgSessionData/search_field/xnat:mgSessionData.ID/project/@Field2">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-				<InsertValue id="Field2" field="@WHERE"/>
-			</Property>
-		</HTML-Link>
-		<SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_mgsessiondata_project_id,sharing_share_xnat_experimentda_id FROM (	SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE'	UNION 	SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:mgSessionData.ID" queryField="sharing_share_xnat_experimentda_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mgSessionData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mgSessionData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayField id="XNAT_MGSESSIONDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">field</Content>
-		<SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:mgSessionData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:mgSessionData.ID" queryField="expt_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="MGSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="RPT"/>
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="MGSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="MGSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="EXPT_ID"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="MGSession" dark-color="9999CC" light-color="CCCCFF">
-	</DisplayVersion>
-	<DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="MGSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="XNAT_MGSESSIONDATA_PROJECT_IDENTIFIER"/>
-		<DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<ViewLink alias="XNAT_MGSESSIONDATA_PROJECTS">
-		<Mapping TableName="XNAT_MGSESSIONDATA_PROJECTS">
-			<MappingColumn rootElement="xnat:mgSessionData" fieldElement="xnat:mgSessionData.ID" mapsTo="id"/>
-		</Mapping>
-	</ViewLink>
-	<SQLView name="XNAT_MGSESSIONDATA_PROJECTS" sql="SELECT id, '&lt;' || expt.project || '&gt;' || xs_a_concat(',&lt;' || shared.project || '&gt;') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:mgSessionData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_mrScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_mrScanData_display.xml
deleted file mode 100644
index 9f198558..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_mrScanData_display.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:mrScanData" full-description="MRScan" brief-description="MRScan">
-	<DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/image_session_ID"/>
-	</DisplayField>
-	<DisplayField id="NOTE" header="note" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/note"/>
-	</DisplayField>
-	<DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/quality"/>
-	</DisplayField>
-	<DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/condition"/>
-	</DisplayField>
-	<DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/series_description"/>
-	</DisplayField>
-	<DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/documentation"/>
-	</DisplayField>
-	<DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/scanner"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/scanner/manufacturer"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/scanner/model"/>
-	</DisplayField>
-	<DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/modality"/>
-	</DisplayField>
-	<DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/frames"/>
-	</DisplayField>
-	<DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/operator"/>
-	</DisplayField>
-	<DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/startTime"/>
-	</DisplayField>
-	<DisplayField id="ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/ID"/>
-	</DisplayField>
-	<DisplayField id="TYPE" header="type" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/type"/>
-	</DisplayField>
-	<DisplayField id="UID" header="UID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/UID"/>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="project" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/project"/>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrScanData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrScanData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayField id="COIL" header="coil" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/coil"/>
-	</DisplayField>
-	<DisplayField id="FIELDSTRENGTH" header="fieldStrength" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/fieldStrength"/>
-	</DisplayField>
-	<DisplayField id="MARKER" header="marker" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/marker"/>
-	</DisplayField>
-	<DisplayField id="STABILIZATION" header="stabilization" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/stabilization"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_VOXELRES_UNITS" header="units" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/parameters/voxelRes/units"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_VOXELRES_X" header="x" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/parameters/voxelRes/x"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_VOXELRES_Y" header="y" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/parameters/voxelRes/y"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_VOXELRES_Z" header="z" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/parameters/voxelRes/z"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_ORIENTATION" header="orientation" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/parameters/orientation"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_FOV_X" header="x" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/parameters/fov/x"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_FOV_Y" header="y" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/parameters/fov/y"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_MATRIX_X" header="x" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/parameters/matrix/x"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_MATRIX_Y" header="y" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/parameters/matrix/y"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_PARTITIONS" header="partitions" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/parameters/partitions"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_TR" header="tr" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/parameters/tr"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_TE" header="te" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/parameters/te"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_TI" header="ti" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/parameters/ti"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_FLIP" header="flip" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/parameters/flip"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_SEQUENCE" header="sequence" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/parameters/sequence"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_ORIGIN" header="origin" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/parameters/origin"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_IMAGETYPE" header="imageType" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/parameters/imageType"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_SCANSEQUENCE" header="scanSequence" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/parameters/scanSequence"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_SEQVARIANT" header="seqVariant" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/parameters/seqVariant"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_SCANOPTIONS" header="scanOptions" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/parameters/scanOptions"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_ACQTYPE" header="acqType" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/parameters/acqType"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_COIL" header="coil" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/parameters/coil"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_DTIACQCOUNT" header="dtiAcqCount" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/parameters/dtiAcqCount"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_PIXELBANDWIDTH" header="pixelBandwidth" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/parameters/pixelBandwidth"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_DIFFUSION_BVALUES" header="bValues" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/parameters/diffusion/bValues"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_DIFFUSION_DIRECTIONALITY" header="directionality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/parameters/diffusion/directionality"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_DIFFUSION_ORIENTATIONS" header="orientations" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/parameters/diffusion/orientations"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_DIFFUSION_ANISOTROPYTYPE" header="anisotropyType" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/parameters/diffusion/anisotropyType"/>
-	</DisplayField>
-	<DisplayField id="DCMVALIDATION" header="dcmValidation" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/dcmValidation"/>
-	</DisplayField>
-	<DisplayField id="DCMVALIDATION_STATUS" header="status" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/dcmValidation/status"/>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="MRScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-		<DisplayFieldRef id="COIL"/>
-		<DisplayFieldRef id="FIELDSTRENGTH"/>
-		<DisplayFieldRef id="MARKER"/>
-		<DisplayFieldRef id="STABILIZATION"/>
-		<DisplayFieldRef id="PARAMETERS_VOXELRES_UNITS"/>
-		<DisplayFieldRef id="PARAMETERS_VOXELRES_X"/>
-		<DisplayFieldRef id="PARAMETERS_VOXELRES_Y"/>
-		<DisplayFieldRef id="PARAMETERS_VOXELRES_Z"/>
-		<DisplayFieldRef id="PARAMETERS_ORIENTATION"/>
-		<DisplayFieldRef id="PARAMETERS_FOV_X"/>
-		<DisplayFieldRef id="PARAMETERS_FOV_Y"/>
-		<DisplayFieldRef id="PARAMETERS_MATRIX_X"/>
-		<DisplayFieldRef id="PARAMETERS_MATRIX_Y"/>
-		<DisplayFieldRef id="PARAMETERS_PARTITIONS"/>
-		<DisplayFieldRef id="PARAMETERS_TR"/>
-		<DisplayFieldRef id="PARAMETERS_TE"/>
-		<DisplayFieldRef id="PARAMETERS_TI"/>
-		<DisplayFieldRef id="PARAMETERS_FLIP"/>
-		<DisplayFieldRef id="PARAMETERS_SEQUENCE"/>
-		<DisplayFieldRef id="PARAMETERS_ORIGIN"/>
-		<DisplayFieldRef id="PARAMETERS_IMAGETYPE"/>
-		<DisplayFieldRef id="PARAMETERS_SCANSEQUENCE"/>
-		<DisplayFieldRef id="PARAMETERS_SEQVARIANT"/>
-		<DisplayFieldRef id="PARAMETERS_SCANOPTIONS"/>
-		<DisplayFieldRef id="PARAMETERS_ACQTYPE"/>
-		<DisplayFieldRef id="PARAMETERS_COIL"/>
-		<DisplayFieldRef id="PARAMETERS_DTIACQCOUNT"/>
-		<DisplayFieldRef id="PARAMETERS_PIXELBANDWIDTH"/>
-		<DisplayFieldRef id="PARAMETERS_DIFFUSION_BVALUES"/>
-		<DisplayFieldRef id="PARAMETERS_DIFFUSION_DIRECTIONALITY"/>
-		<DisplayFieldRef id="PARAMETERS_DIFFUSION_ORIENTATIONS"/>
-		<DisplayFieldRef id="PARAMETERS_DIFFUSION_ANISOTROPYTYPE"/>
-		<DisplayFieldRef id="DCMVALIDATION"/>
-		<DisplayFieldRef id="DCMVALIDATION_STATUS"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="MRScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-		<DisplayFieldRef id="COIL"/>
-		<DisplayFieldRef id="FIELDSTRENGTH"/>
-		<DisplayFieldRef id="MARKER"/>
-		<DisplayFieldRef id="STABILIZATION"/>
-		<DisplayFieldRef id="PARAMETERS_VOXELRES_UNITS"/>
-		<DisplayFieldRef id="PARAMETERS_VOXELRES_X"/>
-		<DisplayFieldRef id="PARAMETERS_VOXELRES_Y"/>
-		<DisplayFieldRef id="PARAMETERS_VOXELRES_Z"/>
-		<DisplayFieldRef id="PARAMETERS_ORIENTATION"/>
-		<DisplayFieldRef id="PARAMETERS_FOV_X"/>
-		<DisplayFieldRef id="PARAMETERS_FOV_Y"/>
-		<DisplayFieldRef id="PARAMETERS_MATRIX_X"/>
-		<DisplayFieldRef id="PARAMETERS_MATRIX_Y"/>
-		<DisplayFieldRef id="PARAMETERS_PARTITIONS"/>
-		<DisplayFieldRef id="PARAMETERS_TR"/>
-		<DisplayFieldRef id="PARAMETERS_TE"/>
-		<DisplayFieldRef id="PARAMETERS_TI"/>
-		<DisplayFieldRef id="PARAMETERS_FLIP"/>
-		<DisplayFieldRef id="PARAMETERS_SEQUENCE"/>
-		<DisplayFieldRef id="PARAMETERS_ORIGIN"/>
-		<DisplayFieldRef id="PARAMETERS_IMAGETYPE"/>
-		<DisplayFieldRef id="PARAMETERS_SCANSEQUENCE"/>
-		<DisplayFieldRef id="PARAMETERS_SEQVARIANT"/>
-		<DisplayFieldRef id="PARAMETERS_SCANOPTIONS"/>
-		<DisplayFieldRef id="PARAMETERS_ACQTYPE"/>
-		<DisplayFieldRef id="PARAMETERS_COIL"/>
-		<DisplayFieldRef id="PARAMETERS_DTIACQCOUNT"/>
-		<DisplayFieldRef id="PARAMETERS_PIXELBANDWIDTH"/>
-		<DisplayFieldRef id="PARAMETERS_DIFFUSION_BVALUES"/>
-		<DisplayFieldRef id="PARAMETERS_DIFFUSION_DIRECTIONALITY"/>
-		<DisplayFieldRef id="PARAMETERS_DIFFUSION_ORIENTATIONS"/>
-		<DisplayFieldRef id="PARAMETERS_DIFFUSION_ANISOTROPYTYPE"/>
-		<DisplayFieldRef id="DCMVALIDATION"/>
-		<DisplayFieldRef id="DCMVALIDATION_STATUS"/>
-	</DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_mrsScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_mrsScanData_display.xml
deleted file mode 100644
index a0b68375..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_mrsScanData_display.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:mrsScanData" full-description="MRSScan" brief-description="MRSScan">
-	<DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrsScanData/image_session_ID"/>
-	</DisplayField>
-	<DisplayField id="NOTE" header="note" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrsScanData/note"/>
-	</DisplayField>
-	<DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrsScanData/quality"/>
-	</DisplayField>
-	<DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrsScanData/condition"/>
-	</DisplayField>
-	<DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrsScanData/series_description"/>
-	</DisplayField>
-	<DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrsScanData/documentation"/>
-	</DisplayField>
-	<DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrsScanData/scanner"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrsScanData/scanner/manufacturer"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrsScanData/scanner/model"/>
-	</DisplayField>
-	<DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrsScanData/modality"/>
-	</DisplayField>
-	<DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrsScanData/frames"/>
-	</DisplayField>
-	<DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrsScanData/operator"/>
-	</DisplayField>
-	<DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrsScanData/startTime"/>
-	</DisplayField>
-	<DisplayField id="ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrsScanData/ID"/>
-	</DisplayField>
-	<DisplayField id="TYPE" header="type" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrsScanData/type"/>
-	</DisplayField>
-	<DisplayField id="UID" header="UID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrsScanData/UID"/>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="project" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrsScanData/project"/>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrsScanData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrsScanData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="MRSScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="MRSScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-	</DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_nmScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_nmScanData_display.xml
deleted file mode 100644
index 58f8d7c9..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_nmScanData_display.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:nmScanData" full-description="NMScan" brief-description="NMScan">
-	<DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:nmScanData/image_session_ID"/>
-	</DisplayField>
-	<DisplayField id="NOTE" header="note" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:nmScanData/note"/>
-	</DisplayField>
-	<DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:nmScanData/quality"/>
-	</DisplayField>
-	<DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:nmScanData/condition"/>
-	</DisplayField>
-	<DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:nmScanData/series_description"/>
-	</DisplayField>
-	<DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:nmScanData/documentation"/>
-	</DisplayField>
-	<DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:nmScanData/scanner"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:nmScanData/scanner/manufacturer"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:nmScanData/scanner/model"/>
-	</DisplayField>
-	<DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:nmScanData/modality"/>
-	</DisplayField>
-	<DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:nmScanData/frames"/>
-	</DisplayField>
-	<DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:nmScanData/operator"/>
-	</DisplayField>
-	<DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:nmScanData/startTime"/>
-	</DisplayField>
-	<DisplayField id="ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:nmScanData/ID"/>
-	</DisplayField>
-	<DisplayField id="TYPE" header="type" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:nmScanData/type"/>
-	</DisplayField>
-	<DisplayField id="UID" header="UID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:nmScanData/UID"/>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="project" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:nmScanData/project"/>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:nmScanData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:nmScanData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="NMScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="NMScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-	</DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_nmSessionData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_nmSessionData_display.xml
deleted file mode 100644
index e56a4849..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_nmSessionData_display.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:nmSessionData" full-description="NMSession" brief-description="NMSession">
-	<Arc name="PARTICIPANT_EXPERIMENT">
-		<CommonField id="PART_ID" local-field="SUBJECT_ID"/>
-		<CommonField id="DATE" local-field="DATE"/>
-		<CommonField id="EXPT_ID" local-field="EXPT_ID"/>
-	</Arc>
-	<DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:nmSessionData.subject_ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
-				<InsertValue id="Field1" field="SUBJECT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:nmSessionData.ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:nmSessionData','xnat:nmSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="RPT" header="ID" visible="true" image="true">
-		<Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:nmSessionData','xnat:nmSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="DATE" header="Date" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:nmSessionData.date"/>
-	</DisplayField>
-	<DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
-	<DisplayFieldElement name="Field1" schema-element="xnat:nmSessionData.date"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
-	<DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
-	<Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
-	</DisplayField>
-	<DisplayField header="Projects" id="PROJECTS" data-type="string">
-		<DisplayFieldElement name="Field1" viewName="XNAT_NMSESSIONDATA_PROJECTS" viewColumn="PROJECTS"/>
-	</DisplayField>
-	<DisplayField header="Label" id="LABEL" data-type="string">
-	<DisplayFieldElement name="Field1" schema-element="xnat:nmSessionData.ID"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:nmSessionData.label"/>
-	<Content type="sql">COALESCE(@Field2, @Field1)</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:nmSessionData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:nmSessionData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:nmSessionData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:nmSessionData/search_field/xnat:nmSessionData.ID">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:nmSessionData','xnat:nmSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="TITLE" value="Inserted: @Field1 (@Field2)">
-				<InsertValue id="Field1" field="INSERT_DATE"/>
-				<InsertValue id="Field2" field="INSERT_USER"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:nmSessionData.project"/>
-	</DisplayField>
-	<DisplayField id="XNAT_NMSESSIONDATA_PROJECT_IDENTIFIER" header="XNAT_NMSESSIONDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">xnat_nmsessiondata_project_id</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:nmSessionData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:nmSessionData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:nmSessionData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:nmSessionData/search_field/xnat:nmSessionData.ID/project/@Field2">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-				<InsertValue id="Field2" field="@WHERE"/>
-			</Property>
-		</HTML-Link>
-		<SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_nmsessiondata_project_id,sharing_share_xnat_experimentda_id FROM (	SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE'	UNION 	SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:nmSessionData.ID" queryField="sharing_share_xnat_experimentda_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:nmSessionData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:nmSessionData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayField id="XNAT_NMSESSIONDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">field</Content>
-		<SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:nmSessionData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:nmSessionData.ID" queryField="expt_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="NMSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="RPT"/>
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="NMSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="NMSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="EXPT_ID"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="NMSession" dark-color="9999CC" light-color="CCCCFF">
-	</DisplayVersion>
-	<DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="NMSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="XNAT_NMSESSIONDATA_PROJECT_IDENTIFIER"/>
-		<DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<ViewLink alias="XNAT_NMSESSIONDATA_PROJECTS">
-		<Mapping TableName="XNAT_NMSESSIONDATA_PROJECTS">
-			<MappingColumn rootElement="xnat:nmSessionData" fieldElement="xnat:nmSessionData.ID" mapsTo="id"/>
-		</Mapping>
-	</ViewLink>
-	<SQLView name="XNAT_NMSESSIONDATA_PROJECTS" sql="SELECT id, '&lt;' || expt.project || '&gt;' || xs_a_concat(',&lt;' || shared.project || '&gt;') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:nmSessionData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_opScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_opScanData_display.xml
deleted file mode 100644
index 17e10820..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_opScanData_display.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:opScanData" full-description="OPScan" brief-description="OPScan">
-	<DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:opScanData/image_session_ID"/>
-	</DisplayField>
-	<DisplayField id="NOTE" header="note" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:opScanData/note"/>
-	</DisplayField>
-	<DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:opScanData/quality"/>
-	</DisplayField>
-	<DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:opScanData/condition"/>
-	</DisplayField>
-	<DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:opScanData/series_description"/>
-	</DisplayField>
-	<DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:opScanData/documentation"/>
-	</DisplayField>
-	<DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:opScanData/scanner"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:opScanData/scanner/manufacturer"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:opScanData/scanner/model"/>
-	</DisplayField>
-	<DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:opScanData/modality"/>
-	</DisplayField>
-	<DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:opScanData/frames"/>
-	</DisplayField>
-	<DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:opScanData/operator"/>
-	</DisplayField>
-	<DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:opScanData/startTime"/>
-	</DisplayField>
-	<DisplayField id="ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:opScanData/ID"/>
-	</DisplayField>
-	<DisplayField id="TYPE" header="type" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:opScanData/type"/>
-	</DisplayField>
-	<DisplayField id="UID" header="UID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:opScanData/UID"/>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="project" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:opScanData/project"/>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:opScanData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:opScanData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="OPScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="OPScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-	</DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_opSessionData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_opSessionData_display.xml
deleted file mode 100644
index 73a5a175..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_opSessionData_display.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:opSessionData" full-description="OPSession" brief-description="OPSession">
-	<Arc name="PARTICIPANT_EXPERIMENT">
-		<CommonField id="PART_ID" local-field="SUBJECT_ID"/>
-		<CommonField id="DATE" local-field="DATE"/>
-		<CommonField id="EXPT_ID" local-field="EXPT_ID"/>
-	</Arc>
-	<DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:opSessionData.subject_ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
-				<InsertValue id="Field1" field="SUBJECT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:opSessionData.ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:opSessionData','xnat:opSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="RPT" header="ID" visible="true" image="true">
-		<Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:opSessionData','xnat:opSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="DATE" header="Date" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:opSessionData.date"/>
-	</DisplayField>
-	<DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
-	<DisplayFieldElement name="Field1" schema-element="xnat:opSessionData.date"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
-	<DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
-	<Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
-	</DisplayField>
-	<DisplayField header="Projects" id="PROJECTS" data-type="string">
-		<DisplayFieldElement name="Field1" viewName="XNAT_OPSESSIONDATA_PROJECTS" viewColumn="PROJECTS"/>
-	</DisplayField>
-	<DisplayField header="Label" id="LABEL" data-type="string">
-	<DisplayFieldElement name="Field1" schema-element="xnat:opSessionData.ID"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:opSessionData.label"/>
-	<Content type="sql">COALESCE(@Field2, @Field1)</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:opSessionData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:opSessionData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:opSessionData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:opSessionData/search_field/xnat:opSessionData.ID">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:opSessionData','xnat:opSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="TITLE" value="Inserted: @Field1 (@Field2)">
-				<InsertValue id="Field1" field="INSERT_DATE"/>
-				<InsertValue id="Field2" field="INSERT_USER"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:opSessionData.project"/>
-	</DisplayField>
-	<DisplayField id="XNAT_OPSESSIONDATA_PROJECT_IDENTIFIER" header="XNAT_OPSESSIONDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">xnat_opsessiondata_project_id</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:opSessionData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:opSessionData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:opSessionData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:opSessionData/search_field/xnat:opSessionData.ID/project/@Field2">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-				<InsertValue id="Field2" field="@WHERE"/>
-			</Property>
-		</HTML-Link>
-		<SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_opsessiondata_project_id,sharing_share_xnat_experimentda_id FROM (	SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE'	UNION 	SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:opSessionData.ID" queryField="sharing_share_xnat_experimentda_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:opSessionData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:opSessionData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayField id="XNAT_OPSESSIONDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">field</Content>
-		<SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:opSessionData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:opSessionData.ID" queryField="expt_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="OPSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="RPT"/>
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="OPSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="OPSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="EXPT_ID"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="OPSession" dark-color="9999CC" light-color="CCCCFF">
-	</DisplayVersion>
-	<DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="OPSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="XNAT_OPSESSIONDATA_PROJECT_IDENTIFIER"/>
-		<DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<ViewLink alias="XNAT_OPSESSIONDATA_PROJECTS">
-		<Mapping TableName="XNAT_OPSESSIONDATA_PROJECTS">
-			<MappingColumn rootElement="xnat:opSessionData" fieldElement="xnat:opSessionData.ID" mapsTo="id"/>
-		</Mapping>
-	</ViewLink>
-	<SQLView name="XNAT_OPSESSIONDATA_PROJECTS" sql="SELECT id, '&lt;' || expt.project || '&gt;' || xs_a_concat(',&lt;' || shared.project || '&gt;') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:opSessionData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_optScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_optScanData_display.xml
deleted file mode 100644
index 4c17f60e..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_optScanData_display.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:optScanData" full-description="OPTScan" brief-description="OPTScan">
-	<DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:optScanData/image_session_ID"/>
-	</DisplayField>
-	<DisplayField id="NOTE" header="note" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:optScanData/note"/>
-	</DisplayField>
-	<DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:optScanData/quality"/>
-	</DisplayField>
-	<DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:optScanData/condition"/>
-	</DisplayField>
-	<DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:optScanData/series_description"/>
-	</DisplayField>
-	<DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:optScanData/documentation"/>
-	</DisplayField>
-	<DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:optScanData/scanner"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:optScanData/scanner/manufacturer"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:optScanData/scanner/model"/>
-	</DisplayField>
-	<DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:optScanData/modality"/>
-	</DisplayField>
-	<DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:optScanData/frames"/>
-	</DisplayField>
-	<DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:optScanData/operator"/>
-	</DisplayField>
-	<DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:optScanData/startTime"/>
-	</DisplayField>
-	<DisplayField id="ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:optScanData/ID"/>
-	</DisplayField>
-	<DisplayField id="TYPE" header="type" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:optScanData/type"/>
-	</DisplayField>
-	<DisplayField id="UID" header="UID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:optScanData/UID"/>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="project" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:optScanData/project"/>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:optScanData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:optScanData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_VOXELRES_UNITS" header="units" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:optScanData/parameters/voxelRes/units"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_VOXELRES_X" header="x" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:optScanData/parameters/voxelRes/x"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_VOXELRES_Y" header="y" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:optScanData/parameters/voxelRes/y"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_VOXELRES_Z" header="z" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:optScanData/parameters/voxelRes/z"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_FOV_X" header="x" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:optScanData/parameters/fov/x"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_FOV_Y" header="y" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:optScanData/parameters/fov/y"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_LATERALITY" header="laterality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:optScanData/parameters/laterality"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_ILLUMINATION_WAVELENGTH" header="illumination_wavelength" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:optScanData/parameters/illumination_wavelength"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_ILLUMINATION_POWER" header="illumination_power" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:optScanData/parameters/illumination_power"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_IMAGETYPE" header="imageType" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:optScanData/parameters/imageType"/>
-	</DisplayField>
-	<DisplayField id="DCMVALIDATION" header="dcmValidation" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:optScanData/dcmValidation"/>
-	</DisplayField>
-	<DisplayField id="DCMVALIDATION_STATUS" header="status" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:optScanData/dcmValidation/status"/>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="OPTScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-		<DisplayFieldRef id="PARAMETERS_VOXELRES_UNITS"/>
-		<DisplayFieldRef id="PARAMETERS_VOXELRES_X"/>
-		<DisplayFieldRef id="PARAMETERS_VOXELRES_Y"/>
-		<DisplayFieldRef id="PARAMETERS_VOXELRES_Z"/>
-		<DisplayFieldRef id="PARAMETERS_FOV_X"/>
-		<DisplayFieldRef id="PARAMETERS_FOV_Y"/>
-		<DisplayFieldRef id="PARAMETERS_LATERALITY"/>
-		<DisplayFieldRef id="PARAMETERS_ILLUMINATION_WAVELENGTH"/>
-		<DisplayFieldRef id="PARAMETERS_ILLUMINATION_POWER"/>
-		<DisplayFieldRef id="PARAMETERS_IMAGETYPE"/>
-		<DisplayFieldRef id="DCMVALIDATION"/>
-		<DisplayFieldRef id="DCMVALIDATION_STATUS"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="OPTScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-		<DisplayFieldRef id="PARAMETERS_VOXELRES_UNITS"/>
-		<DisplayFieldRef id="PARAMETERS_VOXELRES_X"/>
-		<DisplayFieldRef id="PARAMETERS_VOXELRES_Y"/>
-		<DisplayFieldRef id="PARAMETERS_VOXELRES_Z"/>
-		<DisplayFieldRef id="PARAMETERS_FOV_X"/>
-		<DisplayFieldRef id="PARAMETERS_FOV_Y"/>
-		<DisplayFieldRef id="PARAMETERS_LATERALITY"/>
-		<DisplayFieldRef id="PARAMETERS_ILLUMINATION_WAVELENGTH"/>
-		<DisplayFieldRef id="PARAMETERS_ILLUMINATION_POWER"/>
-		<DisplayFieldRef id="PARAMETERS_IMAGETYPE"/>
-		<DisplayFieldRef id="DCMVALIDATION"/>
-		<DisplayFieldRef id="DCMVALIDATION_STATUS"/>
-	</DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_optSessionData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_optSessionData_display.xml
deleted file mode 100644
index 97be9d03..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_optSessionData_display.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:optSessionData" full-description="OPTSession" brief-description="OPTSession">
-	<Arc name="PARTICIPANT_EXPERIMENT">
-		<CommonField id="PART_ID" local-field="SUBJECT_ID"/>
-		<CommonField id="DATE" local-field="DATE"/>
-		<CommonField id="EXPT_ID" local-field="EXPT_ID"/>
-	</Arc>
-	<DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:optSessionData.subject_ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
-				<InsertValue id="Field1" field="SUBJECT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:optSessionData.ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:optSessionData','xnat:optSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="RPT" header="ID" visible="true" image="true">
-		<Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:optSessionData','xnat:optSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="DATE" header="Date" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:optSessionData.date"/>
-	</DisplayField>
-	<DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
-	<DisplayFieldElement name="Field1" schema-element="xnat:optSessionData.date"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
-	<DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
-	<Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
-	</DisplayField>
-	<DisplayField header="Projects" id="PROJECTS" data-type="string">
-		<DisplayFieldElement name="Field1" viewName="XNAT_OPTSESSIONDATA_PROJECTS" viewColumn="PROJECTS"/>
-	</DisplayField>
-	<DisplayField header="Label" id="LABEL" data-type="string">
-	<DisplayFieldElement name="Field1" schema-element="xnat:optSessionData.ID"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:optSessionData.label"/>
-	<Content type="sql">COALESCE(@Field2, @Field1)</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:optSessionData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:optSessionData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:optSessionData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:optSessionData/search_field/xnat:optSessionData.ID">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:optSessionData','xnat:optSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="TITLE" value="Inserted: @Field1 (@Field2)">
-				<InsertValue id="Field1" field="INSERT_DATE"/>
-				<InsertValue id="Field2" field="INSERT_USER"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:optSessionData.project"/>
-	</DisplayField>
-	<DisplayField id="XNAT_OPTSESSIONDATA_PROJECT_IDENTIFIER" header="XNAT_OPTSESSIONDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">xnat_optsessiondata_project_id</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:optSessionData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:optSessionData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:optSessionData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:optSessionData/search_field/xnat:optSessionData.ID/project/@Field2">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-				<InsertValue id="Field2" field="@WHERE"/>
-			</Property>
-		</HTML-Link>
-		<SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_optsessiondata_project_id,sharing_share_xnat_experimentda_id FROM (	SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE'	UNION 	SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:optSessionData.ID" queryField="sharing_share_xnat_experimentda_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:optSessionData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:optSessionData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayField id="XNAT_OPTSESSIONDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">field</Content>
-		<SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:optSessionData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:optSessionData.ID" queryField="expt_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="OPTSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="RPT"/>
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="OPTSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="OPTSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="EXPT_ID"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="OPTSession" dark-color="9999CC" light-color="CCCCFF">
-	</DisplayVersion>
-	<DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="OPTSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="XNAT_OPTSESSIONDATA_PROJECT_IDENTIFIER"/>
-		<DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<ViewLink alias="XNAT_OPTSESSIONDATA_PROJECTS">
-		<Mapping TableName="XNAT_OPTSESSIONDATA_PROJECTS">
-			<MappingColumn rootElement="xnat:optSessionData" fieldElement="xnat:optSessionData.ID" mapsTo="id"/>
-		</Mapping>
-	</ViewLink>
-	<SQLView name="XNAT_OPTSESSIONDATA_PROJECTS" sql="SELECT id, '&lt;' || expt.project || '&gt;' || xs_a_concat(',&lt;' || shared.project || '&gt;') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:optSessionData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_otherDicomScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_otherDicomScanData_display.xml
deleted file mode 100644
index 20154a12..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_otherDicomScanData_display.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:otherDicomScanData" full-description="OtherDicomScan" brief-description="OtherDicomScan">
-	<DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:otherDicomScanData/image_session_ID"/>
-	</DisplayField>
-	<DisplayField id="NOTE" header="note" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:otherDicomScanData/note"/>
-	</DisplayField>
-	<DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:otherDicomScanData/quality"/>
-	</DisplayField>
-	<DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:otherDicomScanData/condition"/>
-	</DisplayField>
-	<DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:otherDicomScanData/series_description"/>
-	</DisplayField>
-	<DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:otherDicomScanData/documentation"/>
-	</DisplayField>
-	<DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:otherDicomScanData/scanner"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:otherDicomScanData/scanner/manufacturer"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:otherDicomScanData/scanner/model"/>
-	</DisplayField>
-	<DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:otherDicomScanData/modality"/>
-	</DisplayField>
-	<DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:otherDicomScanData/frames"/>
-	</DisplayField>
-	<DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:otherDicomScanData/operator"/>
-	</DisplayField>
-	<DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:otherDicomScanData/startTime"/>
-	</DisplayField>
-	<DisplayField id="ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:otherDicomScanData/ID"/>
-	</DisplayField>
-	<DisplayField id="TYPE" header="type" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:otherDicomScanData/type"/>
-	</DisplayField>
-	<DisplayField id="UID" header="UID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:otherDicomScanData/UID"/>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="project" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:otherDicomScanData/project"/>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:otherDicomScanData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:otherDicomScanData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="OtherDicomScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="OtherDicomScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-	</DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_otherDicomSessionData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_otherDicomSessionData_display.xml
deleted file mode 100644
index e350529d..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_otherDicomSessionData_display.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:otherDicomSessionData" full-description="OtherDicomSession" brief-description="OtherDicomSession">
-	<Arc name="PARTICIPANT_EXPERIMENT">
-		<CommonField id="PART_ID" local-field="SUBJECT_ID"/>
-		<CommonField id="DATE" local-field="DATE"/>
-		<CommonField id="EXPT_ID" local-field="EXPT_ID"/>
-	</Arc>
-	<DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:otherDicomSessionData.subject_ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
-				<InsertValue id="Field1" field="SUBJECT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:otherDicomSessionData.ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:otherDicomSessionData','xnat:otherDicomSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="RPT" header="ID" visible="true" image="true">
-		<Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:otherDicomSessionData','xnat:otherDicomSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="DATE" header="Date" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:otherDicomSessionData.date"/>
-	</DisplayField>
-	<DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
-	<DisplayFieldElement name="Field1" schema-element="xnat:otherDicomSessionData.date"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
-	<DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
-	<Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
-	</DisplayField>
-	<DisplayField header="Projects" id="PROJECTS" data-type="string">
-		<DisplayFieldElement name="Field1" viewName="XNAT_OTHERDICOMSESSIONDATA_PROJECTS" viewColumn="PROJECTS"/>
-	</DisplayField>
-	<DisplayField header="Label" id="LABEL" data-type="string">
-	<DisplayFieldElement name="Field1" schema-element="xnat:otherDicomSessionData.ID"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:otherDicomSessionData.label"/>
-	<Content type="sql">COALESCE(@Field2, @Field1)</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:otherDicomSessionData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:otherDicomSessionData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:otherDicomSessionData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:otherDicomSessionData/search_field/xnat:otherDicomSessionData.ID">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:otherDicomSessionData','xnat:otherDicomSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="TITLE" value="Inserted: @Field1 (@Field2)">
-				<InsertValue id="Field1" field="INSERT_DATE"/>
-				<InsertValue id="Field2" field="INSERT_USER"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:otherDicomSessionData.project"/>
-	</DisplayField>
-	<DisplayField id="XNAT_OTHERDICOMSESSIONDATA_PROJECT_IDENTIFIER" header="XNAT_OTHERDICOMSESSIONDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">xnat_otherdicomsessiondata_project_id</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:otherDicomSessionData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:otherDicomSessionData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:otherDicomSessionData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:otherDicomSessionData/search_field/xnat:otherDicomSessionData.ID/project/@Field2">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-				<InsertValue id="Field2" field="@WHERE"/>
-			</Property>
-		</HTML-Link>
-		<SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_otherdicomsessiondata_project_id,sharing_share_xnat_experimentda_id FROM (	SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE'	UNION 	SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:otherDicomSessionData.ID" queryField="sharing_share_xnat_experimentda_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:otherDicomSessionData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:otherDicomSessionData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayField id="XNAT_OTHERDICOMSESSIONDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">field</Content>
-		<SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:otherDicomSessionData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:otherDicomSessionData.ID" queryField="expt_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="OtherDicomSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="RPT"/>
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="OtherDicomSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="OtherDicomSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="EXPT_ID"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="OtherDicomSession" dark-color="9999CC" light-color="CCCCFF">
-	</DisplayVersion>
-	<DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="OtherDicomSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="XNAT_OTHERDICOMSESSIONDATA_PROJECT_IDENTIFIER"/>
-		<DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<ViewLink alias="XNAT_OTHERDICOMSESSIONDATA_PROJECTS">
-		<Mapping TableName="XNAT_OTHERDICOMSESSIONDATA_PROJECTS">
-			<MappingColumn rootElement="xnat:otherDicomSessionData" fieldElement="xnat:otherDicomSessionData.ID" mapsTo="id"/>
-		</Mapping>
-	</ViewLink>
-	<SQLView name="XNAT_OTHERDICOMSESSIONDATA_PROJECTS" sql="SELECT id, '&lt;' || expt.project || '&gt;' || xs_a_concat(',&lt;' || shared.project || '&gt;') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:otherDicomSessionData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_pVisitData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_pVisitData_display.xml
deleted file mode 100644
index 4a8b214d..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_pVisitData_display.xml
+++ /dev/null
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:pVisitData" full-description="PVisit" brief-description="PVisit">
-	<DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:pVisitData.subject_ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
-				<InsertValue id="Field1" field="SUBJECT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="SUB_PROJECT_IDENTIFIER" header="Subject" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">sub_project_id</Content>
-		<HTML-Link>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:subjectData/search_field/xnat:subjectData.ID/project/@Field2">
-				<InsertValue id="Field1" field="SUBJECT_ID"/>
-				<InsertValue id="Field2" field="@WHERE"/>
-			</Property>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
-				<InsertValue id="Field1" field="SUBJECT_ID"/>
-			</Property>
-		</HTML-Link>
-		<SubQuery>SELECT DISTINCT CASE WHEN subject_label='' THEN subject_id WHEN subject_label IS NULL THEN subject_id ELSE subject_label END AS sub_project_id,Visit_id FROM (SELECT visit.id AS VISIT_ID,sub.id AS SUBJECT_ID,sub.project AS SUBJECT_PROJECT, sub.label AS SUBJECT_LABEL FROM xnat_pVisitData visit LEFT JOIN xnat_subjectdata sub ON visit.subject_id=sub.id WHERE project='@WHERE' UNION SELECT visit.id, pp.subject_id,pp.project,pp.label FROM xnat_pVisitData visit LEFT JOIN xnat_projectParticipant pp ON visit.subject_id=pp.subject_id WHERE project='@WHERE')SEARCH</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:pVisitData.ID" queryField="visit_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:pVisitData.ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:pVisitData','xnat:pVisitData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="RPT" header="ID" visible="true" image="true">
-		<Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:pVisitData','xnat:pVisitData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="DATE" header="Date" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:pVisitData.date"/>
-	</DisplayField>
-	<DisplayField header="Projects" id="PROJECTS" data-type="string">
-		<DisplayFieldElement name="Field1" viewName="XNAT_PVISITDATA_PROJECTS" viewColumn="PROJECTS"/>
-	</DisplayField>
-	<DisplayField header="Label" id="LABEL" data-type="string">
-	<DisplayFieldElement name="Field1" schema-element="xnat:pVisitData.ID"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:pVisitData.label"/>
-	<Content type="sql">COALESCE(@Field2, @Field1)</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:pVisitData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:pVisitData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:pVisitData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:pVisitData/search_field/xnat:pVisitData.ID">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:pVisitData','xnat:pVisitData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="TITLE" value="Inserted: @Field1 (@Field2)">
-				<InsertValue id="Field1" field="INSERT_DATE"/>
-				<InsertValue id="Field2" field="INSERT_USER"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:pVisitData.project"/>
-	</DisplayField>
-	<DisplayField id="XNAT_PVISITDATA_PROJECT_IDENTIFIER" header="XNAT_PVISITDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">xnat_pvisitdata_project_id</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:pVisitData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:pVisitData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:pVisitData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:pVisitData/search_field/xnat:pVisitData.ID/project/@Field2">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-				<InsertValue id="Field2" field="@WHERE"/>
-			</Property>
-		</HTML-Link>
-		<SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_pvisitdata_project_id,sharing_share_xnat_experimentda_id FROM (	SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE'	UNION 	SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:pVisitData.ID" queryField="sharing_share_xnat_experimentda_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:pVisitData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:pVisitData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayField id="XNAT_PVISITDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">field</Content>
-		<SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:pVisitData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:pVisitData.ID" queryField="expt_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayField id="VISIT_TYPE" header="visit_type" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:pVisitData/visit_type"/>
-	</DisplayField>
-	<DisplayField id="VISIT_NAME" header="visit_name" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:pVisitData/visit_name"/>
-	</DisplayField>
-	<DisplayField id="CLOSED" header="closed" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:pVisitData/closed"/>
-	</DisplayField>
-	<DisplayField id="TERMINAL" header="terminal" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:pVisitData/terminal"/>
-	</DisplayField>
-	<DisplayField id="PROTOCOLVERSION" header="protocolVersion" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:pVisitData/protocolVersion"/>
-	</DisplayField>
-	<DisplayField id="PROTOCOLID" header="protocolId" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:pVisitData/protocolId"/>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="PVisit" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="RPT"/>
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="VISIT_TYPE"/>
-		<DisplayFieldRef id="VISIT_NAME"/>
-		<DisplayFieldRef id="CLOSED"/>
-		<DisplayFieldRef id="TERMINAL"/>
-		<DisplayFieldRef id="PROTOCOLVERSION"/>
-		<DisplayFieldRef id="PROTOCOLID"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="PVisit" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="VISIT_TYPE"/>
-		<DisplayFieldRef id="VISIT_NAME"/>
-		<DisplayFieldRef id="CLOSED"/>
-		<DisplayFieldRef id="TERMINAL"/>
-		<DisplayFieldRef id="PROTOCOLVERSION"/>
-		<DisplayFieldRef id="PROTOCOLID"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="PVisit" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="EXPT_ID"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="VISIT_TYPE"/>
-		<DisplayFieldRef id="VISIT_NAME"/>
-		<DisplayFieldRef id="CLOSED"/>
-		<DisplayFieldRef id="TERMINAL"/>
-		<DisplayFieldRef id="PROTOCOLVERSION"/>
-		<DisplayFieldRef id="PROTOCOLID"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="PVisit" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="EXPT_ID"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="VISIT_TYPE"/>
-		<DisplayFieldRef id="VISIT_NAME"/>
-		<DisplayFieldRef id="CLOSED"/>
-		<DisplayFieldRef id="TERMINAL"/>
-		<DisplayFieldRef id="PROTOCOLVERSION"/>
-		<DisplayFieldRef id="PROTOCOLID"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="PVisit" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="XNAT_PVISITDATA_PROJECT_IDENTIFIER"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="SUB_PROJECT_IDENTIFIER"/>
-		<DisplayFieldRef id="VISIT_TYPE"/>
-		<DisplayFieldRef id="VISIT_NAME"/>
-		<DisplayFieldRef id="CLOSED"/>
-		<DisplayFieldRef id="TERMINAL"/>
-		<DisplayFieldRef id="PROTOCOLVERSION"/>
-		<DisplayFieldRef id="PROTOCOLID"/>
-	</DisplayVersion>
-	<ViewLink alias="XNAT_PVISITDATA_PROJECTS">
-		<Mapping TableName="XNAT_PVISITDATA_PROJECTS">
-			<MappingColumn rootElement="xnat:pVisitData" fieldElement="xnat:pVisitData.ID" mapsTo="id"/>
-		</Mapping>
-	</ViewLink>
-	<SQLView name="XNAT_PVISITDATA_PROJECTS" sql="SELECT id, '&lt;' || expt.project || '&gt;' || xs_a_concat(',&lt;' || shared.project || '&gt;') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:pVisitData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_petScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_petScanData_display.xml
deleted file mode 100644
index 05fadd09..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_petScanData_display.xml
+++ /dev/null
@@ -1,418 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:petScanData" full-description="PETScan" brief-description="PETScan">
-	<DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/image_session_ID"/>
-	</DisplayField>
-	<DisplayField id="NOTE" header="note" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/note"/>
-	</DisplayField>
-	<DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/quality"/>
-	</DisplayField>
-	<DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/condition"/>
-	</DisplayField>
-	<DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/series_description"/>
-	</DisplayField>
-	<DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/documentation"/>
-	</DisplayField>
-	<DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/scanner"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/scanner/manufacturer"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/scanner/model"/>
-	</DisplayField>
-	<DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/modality"/>
-	</DisplayField>
-	<DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/frames"/>
-	</DisplayField>
-	<DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/operator"/>
-	</DisplayField>
-	<DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/startTime"/>
-	</DisplayField>
-	<DisplayField id="ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/ID"/>
-	</DisplayField>
-	<DisplayField id="TYPE" header="type" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/type"/>
-	</DisplayField>
-	<DisplayField id="UID" header="UID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/UID"/>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="project" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/project"/>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_ORIENTATION" header="orientation" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/orientation"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_ORIGINALFILENAME" header="originalFileName" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/originalFileName"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_SYSTEMTYPE" header="systemType" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/systemType"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_FILETYPE" header="fileType" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/fileType"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_TRANSAXIALFOV" header="transaxialFOV" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/transaxialFOV"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_ACQTYPE" header="acqType" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/acqType"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_FACILITY" header="facility" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/facility"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_NUMPLANES" header="numPlanes" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/numPlanes"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_FRAMES_NUMFRAMES" header="numFrames" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/frames/numFrames"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_NUMGATES" header="numGates" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/numGates"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_PLANESEPARATION" header="planeSeparation" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/planeSeparation"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_BINSIZE" header="binSize" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/binSize"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_DATATYPE" header="dataType" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/dataType"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_DIMENSIONS_X" header="x" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/dimensions/x"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_DIMENSIONS_Y" header="y" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/dimensions/y"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_DIMENSIONS_Z" header="z" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/dimensions/z"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_DIMENSIONS_NUM" header="num" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/dimensions/num"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_OFFSET_X" header="x" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/offset/x"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_OFFSET_Y" header="y" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/offset/y"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_OFFSET_Z" header="z" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/offset/z"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_RECONZOOM" header="reconZoom" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/reconZoom"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_PIXELSIZE_X" header="x" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/pixelSize/x"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_PIXELSIZE_Y" header="y" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/pixelSize/y"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_PIXELSIZE_Z" header="z" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/pixelSize/z"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_FILTERCODE" header="filterCode" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/filterCode"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_RESOLUTION_X" header="x" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/resolution/x"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_RESOLUTION_Y" header="y" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/resolution/y"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_RESOLUTION_Z" header="z" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/resolution/z"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_NUMRELEMENTS" header="numRElements" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/numRElements"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_NUMANGLES" header="numAngles" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/numAngles"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_ZROTATIONANGLE" header="ZRotationAngle" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/ZRotationAngle"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_PROCESSINGCODE" header="processingCode" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/processingCode"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_GATEDURATION" header="gateDuration" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/gateDuration"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_RWAVEOFFSET" header="rWaveOffset" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/rWaveOffset"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_NUMACCEPTEDBEATS" header="numAcceptedBeats" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/numAcceptedBeats"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_FILTER_CUTOFF" header="cutoff" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/filter/cutoff"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_ANNOTATION" header="annotation" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/annotation"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_MT_1_1" header="MT_1_1" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/MT_1_1"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_MT_1_2" header="MT_1_2" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/MT_1_2"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_MT_1_3" header="MT_1_3" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/MT_1_3"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_MT_1_4" header="MT_1_4" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/MT_1_4"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_MT_2_1" header="MT_2_1" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/MT_2_1"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_MT_2_2" header="MT_2_2" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/MT_2_2"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_MT_2_3" header="MT_2_3" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/MT_2_3"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_MT_2_4" header="MT_2_4" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/MT_2_4"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_MT_3_1" header="MT_3_1" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/MT_3_1"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_MT_3_2" header="MT_3_2" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/MT_3_2"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_MT_3_3" header="MT_3_3" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/MT_3_3"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_MT_3_4" header="MT_3_4" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/MT_3_4"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_RFILTER_CUTOFF" header="cutoff" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/RFilter/cutoff"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_RFILTER_RESOLUTION" header="resolution" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/RFilter/resolution"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_RFILTER_CODE" header="code" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/RFilter/code"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_RFILTER_ORDER" header="order" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/RFilter/order"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_ZFILTER_CUTOFF" header="cutoff" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/ZFilter/cutoff"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_ZFILTER_RESOLUTION" header="resolution" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/ZFilter/resolution"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_ZFILTER_CODE" header="code" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/ZFilter/code"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_ZFILTER_ORDER" header="order" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/ZFilter/order"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_SCATTERTYPE" header="scatterType" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/scatterType"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_RECONTYPE" header="reconType" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/reconType"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_RECONVIEWS" header="reconViews" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/reconViews"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_BEDPOSITION" header="bedPosition" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/bedPosition"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_ECATCALIBRATIONFACTOR" header="ecatCalibrationFactor" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/ecatCalibrationFactor"/>
-	</DisplayField>
-	<DisplayField id="ECATVALIDATION" header="ecatValidation" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/ecatValidation"/>
-	</DisplayField>
-	<DisplayField id="ECATVALIDATION_STATUS" header="status" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petScanData/ecatValidation/status"/>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="PETScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-		<DisplayFieldRef id="PARAMETERS_ORIENTATION"/>
-		<DisplayFieldRef id="PARAMETERS_ORIGINALFILENAME"/>
-		<DisplayFieldRef id="PARAMETERS_SYSTEMTYPE"/>
-		<DisplayFieldRef id="PARAMETERS_FILETYPE"/>
-		<DisplayFieldRef id="PARAMETERS_TRANSAXIALFOV"/>
-		<DisplayFieldRef id="PARAMETERS_ACQTYPE"/>
-		<DisplayFieldRef id="PARAMETERS_FACILITY"/>
-		<DisplayFieldRef id="PARAMETERS_NUMPLANES"/>
-		<DisplayFieldRef id="PARAMETERS_FRAMES_NUMFRAMES"/>
-		<DisplayFieldRef id="PARAMETERS_NUMGATES"/>
-		<DisplayFieldRef id="PARAMETERS_PLANESEPARATION"/>
-		<DisplayFieldRef id="PARAMETERS_BINSIZE"/>
-		<DisplayFieldRef id="PARAMETERS_DATATYPE"/>
-		<DisplayFieldRef id="PARAMETERS_DIMENSIONS_X"/>
-		<DisplayFieldRef id="PARAMETERS_DIMENSIONS_Y"/>
-		<DisplayFieldRef id="PARAMETERS_DIMENSIONS_Z"/>
-		<DisplayFieldRef id="PARAMETERS_DIMENSIONS_NUM"/>
-		<DisplayFieldRef id="PARAMETERS_OFFSET_X"/>
-		<DisplayFieldRef id="PARAMETERS_OFFSET_Y"/>
-		<DisplayFieldRef id="PARAMETERS_OFFSET_Z"/>
-		<DisplayFieldRef id="PARAMETERS_RECONZOOM"/>
-		<DisplayFieldRef id="PARAMETERS_PIXELSIZE_X"/>
-		<DisplayFieldRef id="PARAMETERS_PIXELSIZE_Y"/>
-		<DisplayFieldRef id="PARAMETERS_PIXELSIZE_Z"/>
-		<DisplayFieldRef id="PARAMETERS_FILTERCODE"/>
-		<DisplayFieldRef id="PARAMETERS_RESOLUTION_X"/>
-		<DisplayFieldRef id="PARAMETERS_RESOLUTION_Y"/>
-		<DisplayFieldRef id="PARAMETERS_RESOLUTION_Z"/>
-		<DisplayFieldRef id="PARAMETERS_NUMRELEMENTS"/>
-		<DisplayFieldRef id="PARAMETERS_NUMANGLES"/>
-		<DisplayFieldRef id="PARAMETERS_ZROTATIONANGLE"/>
-		<DisplayFieldRef id="PARAMETERS_PROCESSINGCODE"/>
-		<DisplayFieldRef id="PARAMETERS_GATEDURATION"/>
-		<DisplayFieldRef id="PARAMETERS_RWAVEOFFSET"/>
-		<DisplayFieldRef id="PARAMETERS_NUMACCEPTEDBEATS"/>
-		<DisplayFieldRef id="PARAMETERS_FILTER_CUTOFF"/>
-		<DisplayFieldRef id="PARAMETERS_ANNOTATION"/>
-		<DisplayFieldRef id="PARAMETERS_MT_1_1"/>
-		<DisplayFieldRef id="PARAMETERS_MT_1_2"/>
-		<DisplayFieldRef id="PARAMETERS_MT_1_3"/>
-		<DisplayFieldRef id="PARAMETERS_MT_1_4"/>
-		<DisplayFieldRef id="PARAMETERS_MT_2_1"/>
-		<DisplayFieldRef id="PARAMETERS_MT_2_2"/>
-		<DisplayFieldRef id="PARAMETERS_MT_2_3"/>
-		<DisplayFieldRef id="PARAMETERS_MT_2_4"/>
-		<DisplayFieldRef id="PARAMETERS_MT_3_1"/>
-		<DisplayFieldRef id="PARAMETERS_MT_3_2"/>
-		<DisplayFieldRef id="PARAMETERS_MT_3_3"/>
-		<DisplayFieldRef id="PARAMETERS_MT_3_4"/>
-		<DisplayFieldRef id="PARAMETERS_RFILTER_CUTOFF"/>
-		<DisplayFieldRef id="PARAMETERS_RFILTER_RESOLUTION"/>
-		<DisplayFieldRef id="PARAMETERS_RFILTER_CODE"/>
-		<DisplayFieldRef id="PARAMETERS_RFILTER_ORDER"/>
-		<DisplayFieldRef id="PARAMETERS_ZFILTER_CUTOFF"/>
-		<DisplayFieldRef id="PARAMETERS_ZFILTER_RESOLUTION"/>
-		<DisplayFieldRef id="PARAMETERS_ZFILTER_CODE"/>
-		<DisplayFieldRef id="PARAMETERS_ZFILTER_ORDER"/>
-		<DisplayFieldRef id="PARAMETERS_SCATTERTYPE"/>
-		<DisplayFieldRef id="PARAMETERS_RECONTYPE"/>
-		<DisplayFieldRef id="PARAMETERS_RECONVIEWS"/>
-		<DisplayFieldRef id="PARAMETERS_BEDPOSITION"/>
-		<DisplayFieldRef id="PARAMETERS_ECATCALIBRATIONFACTOR"/>
-		<DisplayFieldRef id="ECATVALIDATION"/>
-		<DisplayFieldRef id="ECATVALIDATION_STATUS"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="PETScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-		<DisplayFieldRef id="PARAMETERS_ORIENTATION"/>
-		<DisplayFieldRef id="PARAMETERS_ORIGINALFILENAME"/>
-		<DisplayFieldRef id="PARAMETERS_SYSTEMTYPE"/>
-		<DisplayFieldRef id="PARAMETERS_FILETYPE"/>
-		<DisplayFieldRef id="PARAMETERS_TRANSAXIALFOV"/>
-		<DisplayFieldRef id="PARAMETERS_ACQTYPE"/>
-		<DisplayFieldRef id="PARAMETERS_FACILITY"/>
-		<DisplayFieldRef id="PARAMETERS_NUMPLANES"/>
-		<DisplayFieldRef id="PARAMETERS_FRAMES_NUMFRAMES"/>
-		<DisplayFieldRef id="PARAMETERS_NUMGATES"/>
-		<DisplayFieldRef id="PARAMETERS_PLANESEPARATION"/>
-		<DisplayFieldRef id="PARAMETERS_BINSIZE"/>
-		<DisplayFieldRef id="PARAMETERS_DATATYPE"/>
-		<DisplayFieldRef id="PARAMETERS_DIMENSIONS_X"/>
-		<DisplayFieldRef id="PARAMETERS_DIMENSIONS_Y"/>
-		<DisplayFieldRef id="PARAMETERS_DIMENSIONS_Z"/>
-		<DisplayFieldRef id="PARAMETERS_DIMENSIONS_NUM"/>
-		<DisplayFieldRef id="PARAMETERS_OFFSET_X"/>
-		<DisplayFieldRef id="PARAMETERS_OFFSET_Y"/>
-		<DisplayFieldRef id="PARAMETERS_OFFSET_Z"/>
-		<DisplayFieldRef id="PARAMETERS_RECONZOOM"/>
-		<DisplayFieldRef id="PARAMETERS_PIXELSIZE_X"/>
-		<DisplayFieldRef id="PARAMETERS_PIXELSIZE_Y"/>
-		<DisplayFieldRef id="PARAMETERS_PIXELSIZE_Z"/>
-		<DisplayFieldRef id="PARAMETERS_FILTERCODE"/>
-		<DisplayFieldRef id="PARAMETERS_RESOLUTION_X"/>
-		<DisplayFieldRef id="PARAMETERS_RESOLUTION_Y"/>
-		<DisplayFieldRef id="PARAMETERS_RESOLUTION_Z"/>
-		<DisplayFieldRef id="PARAMETERS_NUMRELEMENTS"/>
-		<DisplayFieldRef id="PARAMETERS_NUMANGLES"/>
-		<DisplayFieldRef id="PARAMETERS_ZROTATIONANGLE"/>
-		<DisplayFieldRef id="PARAMETERS_PROCESSINGCODE"/>
-		<DisplayFieldRef id="PARAMETERS_GATEDURATION"/>
-		<DisplayFieldRef id="PARAMETERS_RWAVEOFFSET"/>
-		<DisplayFieldRef id="PARAMETERS_NUMACCEPTEDBEATS"/>
-		<DisplayFieldRef id="PARAMETERS_FILTER_CUTOFF"/>
-		<DisplayFieldRef id="PARAMETERS_ANNOTATION"/>
-		<DisplayFieldRef id="PARAMETERS_MT_1_1"/>
-		<DisplayFieldRef id="PARAMETERS_MT_1_2"/>
-		<DisplayFieldRef id="PARAMETERS_MT_1_3"/>
-		<DisplayFieldRef id="PARAMETERS_MT_1_4"/>
-		<DisplayFieldRef id="PARAMETERS_MT_2_1"/>
-		<DisplayFieldRef id="PARAMETERS_MT_2_2"/>
-		<DisplayFieldRef id="PARAMETERS_MT_2_3"/>
-		<DisplayFieldRef id="PARAMETERS_MT_2_4"/>
-		<DisplayFieldRef id="PARAMETERS_MT_3_1"/>
-		<DisplayFieldRef id="PARAMETERS_MT_3_2"/>
-		<DisplayFieldRef id="PARAMETERS_MT_3_3"/>
-		<DisplayFieldRef id="PARAMETERS_MT_3_4"/>
-		<DisplayFieldRef id="PARAMETERS_RFILTER_CUTOFF"/>
-		<DisplayFieldRef id="PARAMETERS_RFILTER_RESOLUTION"/>
-		<DisplayFieldRef id="PARAMETERS_RFILTER_CODE"/>
-		<DisplayFieldRef id="PARAMETERS_RFILTER_ORDER"/>
-		<DisplayFieldRef id="PARAMETERS_ZFILTER_CUTOFF"/>
-		<DisplayFieldRef id="PARAMETERS_ZFILTER_RESOLUTION"/>
-		<DisplayFieldRef id="PARAMETERS_ZFILTER_CODE"/>
-		<DisplayFieldRef id="PARAMETERS_ZFILTER_ORDER"/>
-		<DisplayFieldRef id="PARAMETERS_SCATTERTYPE"/>
-		<DisplayFieldRef id="PARAMETERS_RECONTYPE"/>
-		<DisplayFieldRef id="PARAMETERS_RECONVIEWS"/>
-		<DisplayFieldRef id="PARAMETERS_BEDPOSITION"/>
-		<DisplayFieldRef id="PARAMETERS_ECATCALIBRATIONFACTOR"/>
-		<DisplayFieldRef id="ECATVALIDATION"/>
-		<DisplayFieldRef id="ECATVALIDATION_STATUS"/>
-	</DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_petSessionData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_petSessionData_display.xml
deleted file mode 100644
index 110454a7..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_petSessionData_display.xml
+++ /dev/null
@@ -1,294 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ D:/Development/XNAT/1.6/xnat_builder_1_6dev/plugin-resources/project-skeletons/xnat/src/schemas/xnat/display/xnat_petSessionData_display.xml
-  ~ XNAT http://www.xnat.org
-  ~ Copyright (c) 2014, Washington University School of Medicine
-  ~ All Rights Reserved
-  ~
-  ~ Released under the Simplified BSD.
-  ~
-  ~ Last modified 2/7/14 12:19 PM
-  -->
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:petSessionData" full-description="PETSession" brief-description="PETSession">
-	<Arc name="PARTICIPANT_EXPERIMENT">
-		<CommonField id="PART_ID" local-field="SUBJECT_ID"/>
-		<CommonField id="DATE" local-field="DATE"/>
-		<CommonField id="EXPT_ID" local-field="EXPT_ID"/>
-	</Arc>
-	<DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petSessionData.subject_ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
-				<InsertValue id="Field1" field="SUBJECT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petSessionData.ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:petSessionData','xnat:petSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="RPT" header="ID" visible="true" image="true">
-		<Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:petSessionData','xnat:petSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="DATE" header="Date" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petSessionData.date"/>
-	</DisplayField>
-	<DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="float">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petSessionData.date"/>
-		<DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
-		<DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
-		<DisplayFieldElement name="Field5" schema-element="xnat:demographicData.age"/>
-		<DisplayFieldElement name="Field4" schema-element="xnat:petSessionData.age"/>
-		<Content type="sql">CAST(FLOOR(CAST(COALESCE(@Field4,@Field5,EXTRACT(YEAR FROM AGE(@Field1, @Field2)),(EXTRACT(YEAR FROM @Field1)) - (@Field3)) AS numeric)) AS numeric)</Content>
-	</DisplayField>
-	<DisplayField header="Projects" id="PROJECTS" data-type="string">
-		<DisplayFieldElement name="Field1" viewName="XNAT_PETSESSIONDATA_PROJECTS" viewColumn="PROJECTS"/>
-	</DisplayField>
-	<DisplayField header="Label" id="LABEL" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petSessionData.ID"/>
-		<DisplayFieldElement name="Field2" schema-element="xnat:petSessionData.label"/>
-		<Content type="sql">COALESCE(@Field2, @Field1)</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:petSessionData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:petSessionData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:petSessionData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:petSessionData/search_field/xnat:petSessionData.ID">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:petSessionData','xnat:petSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="TITLE" value="Inserted: @Field1 (@Field2)">
-				<InsertValue id="Field1" field="INSERT_DATE"/>
-				<InsertValue id="Field2" field="INSERT_USER"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petSessionData.project"/>
-	</DisplayField>
-	<DisplayField id="XNAT_PETSESSIONDATA_PROJECT_IDENTIFIER" header="XNAT_PETSESSIONDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">xnat_petsessiondata_project_id</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:petSessionData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:petSessionData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:petSessionData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:petSessionData/search_field/xnat:petSessionData.ID/project/@Field2">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-				<InsertValue id="Field2" field="@WHERE"/>
-			</Property>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:petSessionData','xnat:petSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-		<SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_petsessiondata_project_id,sharing_share_xnat_experimentda_id FROM (	SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE'	UNION 	SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:petSessionData.ID" queryField="sharing_share_xnat_experimentda_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petSessionData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petSessionData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayField id="XNAT_PETSESSIONDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">field</Content>
-		<SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:petSessionData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:petSessionData.ID" queryField="expt_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayField id="STABILIZATION" header="stabilization" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petSessionData/stabilization"/>
-	</DisplayField>
-	<DisplayField id="STUDYTYPE" header="studyType" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petSessionData/studyType"/>
-	</DisplayField>
-	<DisplayField id="PATIENTID" header="patientID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petSessionData/patientID"/>
-	</DisplayField>
-	<DisplayField id="PATIENTNAME" header="patientName" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petSessionData/patientName"/>
-	</DisplayField>
-	<DisplayField id="TRACER_DOSE_UNITS" header="units" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petSessionData/tracer/dose/units"/>
-	</DisplayField>
-	<DisplayField id="TRACER_DOSE" header="dose" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petSessionData/tracer/dose"/>
-	</DisplayField>
-	<DisplayField id="TRACER_SPECIFICACTIVITY" header="specificActivity" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petSessionData/tracer/specificActivity"/>
-	</DisplayField>
-	<DisplayField id="TRACER_TOTALMASS_UNITS" header="units" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petSessionData/tracer/totalMass/units"/>
-	</DisplayField>
-	<DisplayField id="TRACER_TOTALMASS" header="totalMass" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petSessionData/tracer/totalMass"/>
-	</DisplayField>
-	<DisplayField id="TRACER_INTERMEDIATE_UNITS" header="units" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petSessionData/tracer/intermediate/units"/>
-	</DisplayField>
-	<DisplayField id="TRACER_INTERMEDIATE" header="intermediate" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petSessionData/tracer/intermediate"/>
-	</DisplayField>
-	<DisplayField id="TRACER_ISOTOPE_HALF_LIFE" header="half-life" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petSessionData/tracer/isotope/half-life"/>
-	</DisplayField>
-	<DisplayField id="TRACER_ISOTOPE" header="isotope" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petSessionData/tracer/isotope"/>
-	</DisplayField>
-	<DisplayField id="TRACER_TRANSMISSIONS_STARTTIME" header="startTime" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petSessionData/tracer/transmissions_starttime"/>
-	</DisplayField>
-	<DisplayField id="TRACER_TRANSMISSIONS" header="transmissions" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petSessionData/tracer/transmissions"/>
-	</DisplayField>
-	<DisplayField id="TRACER_NAME" header="name" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petSessionData/tracer/name"/>
-	</DisplayField>
-	<DisplayField id="TRACER_STARTTIME" header="startTime" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petSessionData/tracer/startTime"/>
-	</DisplayField>
-	<DisplayField id="UID" header="UID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petSessionData/UID"/>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="PETSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="RPT"/>
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="AGE"/>
-		<DisplayFieldRef id="STABILIZATION"/>
-		<DisplayFieldRef id="STUDYTYPE"/>
-		<DisplayFieldRef id="PATIENTID"/>
-		<DisplayFieldRef id="PATIENTNAME"/>
-		<DisplayFieldRef id="TRACER_DOSE_UNITS"/>
-		<DisplayFieldRef id="TRACER_DOSE"/>
-		<DisplayFieldRef id="TRACER_SPECIFICACTIVITY"/>
-		<DisplayFieldRef id="TRACER_TOTALMASS_UNITS"/>
-		<DisplayFieldRef id="TRACER_TOTALMASS"/>
-		<DisplayFieldRef id="TRACER_INTERMEDIATE_UNITS"/>
-		<DisplayFieldRef id="TRACER_INTERMEDIATE"/>
-		<DisplayFieldRef id="TRACER_ISOTOPE_HALF_LIFE"/>
-		<DisplayFieldRef id="TRACER_ISOTOPE"/>
-		<DisplayFieldRef id="TRACER_TRANSMISSIONS_STARTTIME"/>
-		<DisplayFieldRef id="TRACER_TRANSMISSIONS"/>
-		<DisplayFieldRef id="TRACER_NAME"/>
-		<DisplayFieldRef id="TRACER_STARTTIME"/>
-		<DisplayFieldRef id="UID"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="PETSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-		<DisplayFieldRef id="STABILIZATION"/>
-		<DisplayFieldRef id="STUDYTYPE"/>
-		<DisplayFieldRef id="PATIENTID"/>
-		<DisplayFieldRef id="PATIENTNAME"/>
-		<DisplayFieldRef id="TRACER_DOSE_UNITS"/>
-		<DisplayFieldRef id="TRACER_DOSE"/>
-		<DisplayFieldRef id="TRACER_SPECIFICACTIVITY"/>
-		<DisplayFieldRef id="TRACER_TOTALMASS_UNITS"/>
-		<DisplayFieldRef id="TRACER_TOTALMASS"/>
-		<DisplayFieldRef id="TRACER_INTERMEDIATE_UNITS"/>
-		<DisplayFieldRef id="TRACER_INTERMEDIATE"/>
-		<DisplayFieldRef id="TRACER_ISOTOPE_HALF_LIFE"/>
-		<DisplayFieldRef id="TRACER_ISOTOPE"/>
-		<DisplayFieldRef id="TRACER_TRANSMISSIONS_STARTTIME"/>
-		<DisplayFieldRef id="TRACER_TRANSMISSIONS"/>
-		<DisplayFieldRef id="TRACER_NAME"/>
-		<DisplayFieldRef id="TRACER_STARTTIME"/>
-		<DisplayFieldRef id="UID"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="PETSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="EXPT_ID"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-		<DisplayFieldRef id="STABILIZATION"/>
-		<DisplayFieldRef id="STUDYTYPE"/>
-		<DisplayFieldRef id="PATIENTID"/>
-		<DisplayFieldRef id="PATIENTNAME"/>
-		<DisplayFieldRef id="TRACER_DOSE_UNITS"/>
-		<DisplayFieldRef id="TRACER_DOSE"/>
-		<DisplayFieldRef id="TRACER_SPECIFICACTIVITY"/>
-		<DisplayFieldRef id="TRACER_TOTALMASS_UNITS"/>
-		<DisplayFieldRef id="TRACER_TOTALMASS"/>
-		<DisplayFieldRef id="TRACER_INTERMEDIATE_UNITS"/>
-		<DisplayFieldRef id="TRACER_INTERMEDIATE"/>
-		<DisplayFieldRef id="TRACER_ISOTOPE_HALF_LIFE"/>
-		<DisplayFieldRef id="TRACER_ISOTOPE"/>
-		<DisplayFieldRef id="TRACER_TRANSMISSIONS_STARTTIME"/>
-		<DisplayFieldRef id="TRACER_TRANSMISSIONS"/>
-		<DisplayFieldRef id="TRACER_NAME"/>
-		<DisplayFieldRef id="TRACER_STARTTIME"/>
-		<DisplayFieldRef id="UID"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="PETSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="STABILIZATION"/>
-		<DisplayFieldRef id="STUDYTYPE"/>
-		<DisplayFieldRef id="PATIENTID"/>
-		<DisplayFieldRef id="PATIENTNAME"/>
-		<DisplayFieldRef id="TRACER_DOSE_UNITS"/>
-		<DisplayFieldRef id="TRACER_DOSE"/>
-		<DisplayFieldRef id="TRACER_SPECIFICACTIVITY"/>
-		<DisplayFieldRef id="TRACER_TOTALMASS_UNITS"/>
-		<DisplayFieldRef id="TRACER_TOTALMASS"/>
-		<DisplayFieldRef id="TRACER_INTERMEDIATE_UNITS"/>
-		<DisplayFieldRef id="TRACER_INTERMEDIATE"/>
-		<DisplayFieldRef id="TRACER_ISOTOPE_HALF_LIFE"/>
-		<DisplayFieldRef id="TRACER_ISOTOPE"/>
-		<DisplayFieldRef id="TRACER_TRANSMISSIONS_STARTTIME"/>
-		<DisplayFieldRef id="TRACER_TRANSMISSIONS"/>
-		<DisplayFieldRef id="TRACER_NAME"/>
-		<DisplayFieldRef id="TRACER_STARTTIME"/>
-		<DisplayFieldRef id="UID"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="PETSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="XNAT_PETSESSIONDATA_PROJECT_IDENTIFIER"/>
-		<DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-		<DisplayFieldRef id="STABILIZATION"/>
-		<DisplayFieldRef id="STUDYTYPE"/>
-		<DisplayFieldRef id="PATIENTID"/>
-		<DisplayFieldRef id="PATIENTNAME"/>
-		<DisplayFieldRef id="TRACER_DOSE_UNITS"/>
-		<DisplayFieldRef id="TRACER_DOSE"/>
-		<DisplayFieldRef id="TRACER_SPECIFICACTIVITY"/>
-		<DisplayFieldRef id="TRACER_TOTALMASS_UNITS"/>
-		<DisplayFieldRef id="TRACER_TOTALMASS"/>
-		<DisplayFieldRef id="TRACER_INTERMEDIATE_UNITS"/>
-		<DisplayFieldRef id="TRACER_INTERMEDIATE"/>
-		<DisplayFieldRef id="TRACER_ISOTOPE_HALF_LIFE"/>
-		<DisplayFieldRef id="TRACER_ISOTOPE"/>
-		<DisplayFieldRef id="TRACER_TRANSMISSIONS_STARTTIME"/>
-		<DisplayFieldRef id="TRACER_TRANSMISSIONS"/>
-		<DisplayFieldRef id="TRACER_NAME"/>
-		<DisplayFieldRef id="TRACER_STARTTIME"/>
-		<DisplayFieldRef id="UID"/>
-	</DisplayVersion>
-	<ViewLink alias="XNAT_PETSESSIONDATA_PROJECTS">
-		<Mapping TableName="XNAT_PETSESSIONDATA_PROJECTS">
-			<MappingColumn rootElement="xnat:petSessionData" fieldElement="xnat:petSessionData.ID" mapsTo="id"/>
-		</Mapping>
-	</ViewLink>
-	<SQLView name="XNAT_PETSESSIONDATA_PROJECTS" sql="SELECT id, '&lt;' || expt.project || '&gt;' || xs_a_concat(',&lt;' || shared.project || '&gt;') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:petSessionData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_petmrSessionData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_petmrSessionData_display.xml
deleted file mode 100644
index c04a2496..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_petmrSessionData_display.xml
+++ /dev/null
@@ -1,343 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:petmrSessionData" full-description="PETMRSession" brief-description="PETMRSession">
-	<Arc name="PARTICIPANT_EXPERIMENT">
-		<CommonField id="PART_ID" local-field="SUBJECT_ID"/>
-		<CommonField id="DATE" local-field="DATE"/>
-		<CommonField id="EXPT_ID" local-field="EXPT_ID"/>
-	</Arc>
-	<DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData.subject_ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
-				<InsertValue id="Field1" field="SUBJECT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData.ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:petmrSessionData','xnat:petmrSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="RPT" header="ID" visible="true" image="true">
-		<Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:petmrSessionData','xnat:petmrSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="DATE" header="Date" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData.date"/>
-	</DisplayField>
-	<DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
-	<DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData.date"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
-	<DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
-	<Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
-	</DisplayField>
-	<DisplayField header="Projects" id="PROJECTS" data-type="string">
-		<DisplayFieldElement name="Field1" viewName="XNAT_PETMRSESSIONDATA_PROJECTS" viewColumn="PROJECTS"/>
-	</DisplayField>
-	<DisplayField header="Label" id="LABEL" data-type="string">
-	<DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData.ID"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:petmrSessionData.label"/>
-	<Content type="sql">COALESCE(@Field2, @Field1)</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:petmrSessionData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:petmrSessionData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:petmrSessionData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:petmrSessionData/search_field/xnat:petmrSessionData.ID">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:petmrSessionData','xnat:petmrSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="TITLE" value="Inserted: @Field1 (@Field2)">
-				<InsertValue id="Field1" field="INSERT_DATE"/>
-				<InsertValue id="Field2" field="INSERT_USER"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData.project"/>
-	</DisplayField>
-	<DisplayField id="XNAT_PETMRSESSIONDATA_PROJECT_IDENTIFIER" header="XNAT_PETMRSESSIONDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">xnat_petmrsessiondata_project_id</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:petmrSessionData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:petmrSessionData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:petmrSessionData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:petmrSessionData/search_field/xnat:petmrSessionData.ID/project/@Field2">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-				<InsertValue id="Field2" field="@WHERE"/>
-			</Property>
-		</HTML-Link>
-		<SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_petmrsessiondata_project_id,sharing_share_xnat_experimentda_id FROM (	SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE'	UNION 	SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:petmrSessionData.ID" queryField="sharing_share_xnat_experimentda_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayField id="XNAT_PETMRSESSIONDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">field</Content>
-		<SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:petmrSessionData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:petmrSessionData.ID" queryField="expt_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayField id="COIL" header="coil" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData/coil"/>
-	</DisplayField>
-	<DisplayField id="FIELDSTRENGTH" header="fieldStrength" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData/fieldStrength"/>
-	</DisplayField>
-	<DisplayField id="MARKER" header="marker" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData/marker"/>
-	</DisplayField>
-	<DisplayField id="STABILIZATION" header="stabilization" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData/stabilization"/>
-	</DisplayField>
-	<DisplayField id="STUDYTYPE" header="studyType" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData/studyType"/>
-	</DisplayField>
-	<DisplayField id="PATIENTID" header="patientID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData/patientID"/>
-	</DisplayField>
-	<DisplayField id="PATIENTNAME" header="patientName" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData/patientName"/>
-	</DisplayField>
-	<DisplayField id="TRACER_DOSE_UNITS" header="units" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData/tracer/dose/units"/>
-	</DisplayField>
-	<DisplayField id="TRACER_DOSE" header="dose" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData/tracer/dose"/>
-	</DisplayField>
-	<DisplayField id="TRACER_SPECIFICACTIVITY" header="specificActivity" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData/tracer/specificActivity"/>
-	</DisplayField>
-	<DisplayField id="TRACER_TOTALMASS_UNITS" header="units" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData/tracer/totalMass/units"/>
-	</DisplayField>
-	<DisplayField id="TRACER_TOTALMASS" header="totalMass" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData/tracer/totalMass"/>
-	</DisplayField>
-	<DisplayField id="TRACER_INTERMEDIATE_UNITS" header="units" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData/tracer/intermediate/units"/>
-	</DisplayField>
-	<DisplayField id="TRACER_INTERMEDIATE" header="intermediate" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData/tracer/intermediate"/>
-	</DisplayField>
-	<DisplayField id="TRACER_ISOTOPE_HALF_LIFE" header="half-life" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData/tracer/isotope/half-life"/>
-	</DisplayField>
-	<DisplayField id="TRACER_ISOTOPE" header="isotope" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData/tracer/isotope"/>
-	</DisplayField>
-	<DisplayField id="TRACER_TRANSMISSIONS" header="transmissions" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData/tracer/transmissions"/>
-	</DisplayField>
-	<DisplayField id="TRACER_TRANSMISSIONS_STARTTIME" header="transmissions_starttime" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData/tracer/transmissions_starttime"/>
-	</DisplayField>
-	<DisplayField id="TRACER_NAME" header="name" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData/tracer/name"/>
-	</DisplayField>
-	<DisplayField id="TRACER_STARTTIME" header="startTime" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData/tracer/startTime"/>
-	</DisplayField>
-	<DisplayField id="START_TIME" header="start_time" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData/start_time"/>
-	</DisplayField>
-	<DisplayField id="START_TIME_SCAN" header="start_time_scan" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData/start_time_scan"/>
-	</DisplayField>
-	<DisplayField id="START_TIME_INJECTION" header="start_time_injection" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData/start_time_injection"/>
-	</DisplayField>
-	<DisplayField id="BLOOD_GLUCOSE" header="blood_glucose" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData/blood_glucose"/>
-	</DisplayField>
-	<DisplayField id="BLOOD_GLUCOSE_UNITS" header="blood_glucose_units" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData/blood_glucose_units"/>
-	</DisplayField>
-	<DisplayField id="BLOOD_GLUCOSE_TIME" header="blood_glucose_time" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData/blood_glucose_time"/>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="PETMRSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="RPT"/>
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="AGE"/>
-		<DisplayFieldRef id="COIL"/>
-		<DisplayFieldRef id="FIELDSTRENGTH"/>
-		<DisplayFieldRef id="MARKER"/>
-		<DisplayFieldRef id="STABILIZATION"/>
-		<DisplayFieldRef id="STUDYTYPE"/>
-		<DisplayFieldRef id="PATIENTID"/>
-		<DisplayFieldRef id="PATIENTNAME"/>
-		<DisplayFieldRef id="TRACER_DOSE_UNITS"/>
-		<DisplayFieldRef id="TRACER_DOSE"/>
-		<DisplayFieldRef id="TRACER_SPECIFICACTIVITY"/>
-		<DisplayFieldRef id="TRACER_TOTALMASS_UNITS"/>
-		<DisplayFieldRef id="TRACER_TOTALMASS"/>
-		<DisplayFieldRef id="TRACER_INTERMEDIATE_UNITS"/>
-		<DisplayFieldRef id="TRACER_INTERMEDIATE"/>
-		<DisplayFieldRef id="TRACER_ISOTOPE_HALF_LIFE"/>
-		<DisplayFieldRef id="TRACER_ISOTOPE"/>
-		<DisplayFieldRef id="TRACER_TRANSMISSIONS"/>
-		<DisplayFieldRef id="TRACER_TRANSMISSIONS_STARTTIME"/>
-		<DisplayFieldRef id="TRACER_NAME"/>
-		<DisplayFieldRef id="TRACER_STARTTIME"/>
-		<DisplayFieldRef id="START_TIME"/>
-		<DisplayFieldRef id="START_TIME_SCAN"/>
-		<DisplayFieldRef id="START_TIME_INJECTION"/>
-		<DisplayFieldRef id="BLOOD_GLUCOSE"/>
-		<DisplayFieldRef id="BLOOD_GLUCOSE_UNITS"/>
-		<DisplayFieldRef id="BLOOD_GLUCOSE_TIME"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="PETMRSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-		<DisplayFieldRef id="COIL"/>
-		<DisplayFieldRef id="FIELDSTRENGTH"/>
-		<DisplayFieldRef id="MARKER"/>
-		<DisplayFieldRef id="STABILIZATION"/>
-		<DisplayFieldRef id="STUDYTYPE"/>
-		<DisplayFieldRef id="PATIENTID"/>
-		<DisplayFieldRef id="PATIENTNAME"/>
-		<DisplayFieldRef id="TRACER_DOSE_UNITS"/>
-		<DisplayFieldRef id="TRACER_DOSE"/>
-		<DisplayFieldRef id="TRACER_SPECIFICACTIVITY"/>
-		<DisplayFieldRef id="TRACER_TOTALMASS_UNITS"/>
-		<DisplayFieldRef id="TRACER_TOTALMASS"/>
-		<DisplayFieldRef id="TRACER_INTERMEDIATE_UNITS"/>
-		<DisplayFieldRef id="TRACER_INTERMEDIATE"/>
-		<DisplayFieldRef id="TRACER_ISOTOPE_HALF_LIFE"/>
-		<DisplayFieldRef id="TRACER_ISOTOPE"/>
-		<DisplayFieldRef id="TRACER_TRANSMISSIONS"/>
-		<DisplayFieldRef id="TRACER_TRANSMISSIONS_STARTTIME"/>
-		<DisplayFieldRef id="TRACER_NAME"/>
-		<DisplayFieldRef id="TRACER_STARTTIME"/>
-		<DisplayFieldRef id="START_TIME"/>
-		<DisplayFieldRef id="START_TIME_SCAN"/>
-		<DisplayFieldRef id="START_TIME_INJECTION"/>
-		<DisplayFieldRef id="BLOOD_GLUCOSE"/>
-		<DisplayFieldRef id="BLOOD_GLUCOSE_UNITS"/>
-		<DisplayFieldRef id="BLOOD_GLUCOSE_TIME"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="PETMRSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="EXPT_ID"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-		<DisplayFieldRef id="COIL"/>
-		<DisplayFieldRef id="FIELDSTRENGTH"/>
-		<DisplayFieldRef id="MARKER"/>
-		<DisplayFieldRef id="STABILIZATION"/>
-		<DisplayFieldRef id="STUDYTYPE"/>
-		<DisplayFieldRef id="PATIENTID"/>
-		<DisplayFieldRef id="PATIENTNAME"/>
-		<DisplayFieldRef id="TRACER_DOSE_UNITS"/>
-		<DisplayFieldRef id="TRACER_DOSE"/>
-		<DisplayFieldRef id="TRACER_SPECIFICACTIVITY"/>
-		<DisplayFieldRef id="TRACER_TOTALMASS_UNITS"/>
-		<DisplayFieldRef id="TRACER_TOTALMASS"/>
-		<DisplayFieldRef id="TRACER_INTERMEDIATE_UNITS"/>
-		<DisplayFieldRef id="TRACER_INTERMEDIATE"/>
-		<DisplayFieldRef id="TRACER_ISOTOPE_HALF_LIFE"/>
-		<DisplayFieldRef id="TRACER_ISOTOPE"/>
-		<DisplayFieldRef id="TRACER_TRANSMISSIONS"/>
-		<DisplayFieldRef id="TRACER_TRANSMISSIONS_STARTTIME"/>
-		<DisplayFieldRef id="TRACER_NAME"/>
-		<DisplayFieldRef id="TRACER_STARTTIME"/>
-		<DisplayFieldRef id="START_TIME"/>
-		<DisplayFieldRef id="START_TIME_SCAN"/>
-		<DisplayFieldRef id="START_TIME_INJECTION"/>
-		<DisplayFieldRef id="BLOOD_GLUCOSE"/>
-		<DisplayFieldRef id="BLOOD_GLUCOSE_UNITS"/>
-		<DisplayFieldRef id="BLOOD_GLUCOSE_TIME"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="PETMRSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="COIL"/>
-		<DisplayFieldRef id="FIELDSTRENGTH"/>
-		<DisplayFieldRef id="MARKER"/>
-		<DisplayFieldRef id="STABILIZATION"/>
-		<DisplayFieldRef id="STUDYTYPE"/>
-		<DisplayFieldRef id="PATIENTID"/>
-		<DisplayFieldRef id="PATIENTNAME"/>
-		<DisplayFieldRef id="TRACER_DOSE_UNITS"/>
-		<DisplayFieldRef id="TRACER_DOSE"/>
-		<DisplayFieldRef id="TRACER_SPECIFICACTIVITY"/>
-		<DisplayFieldRef id="TRACER_TOTALMASS_UNITS"/>
-		<DisplayFieldRef id="TRACER_TOTALMASS"/>
-		<DisplayFieldRef id="TRACER_INTERMEDIATE_UNITS"/>
-		<DisplayFieldRef id="TRACER_INTERMEDIATE"/>
-		<DisplayFieldRef id="TRACER_ISOTOPE_HALF_LIFE"/>
-		<DisplayFieldRef id="TRACER_ISOTOPE"/>
-		<DisplayFieldRef id="TRACER_TRANSMISSIONS"/>
-		<DisplayFieldRef id="TRACER_TRANSMISSIONS_STARTTIME"/>
-		<DisplayFieldRef id="TRACER_NAME"/>
-		<DisplayFieldRef id="TRACER_STARTTIME"/>
-		<DisplayFieldRef id="START_TIME"/>
-		<DisplayFieldRef id="START_TIME_SCAN"/>
-		<DisplayFieldRef id="START_TIME_INJECTION"/>
-		<DisplayFieldRef id="BLOOD_GLUCOSE"/>
-		<DisplayFieldRef id="BLOOD_GLUCOSE_UNITS"/>
-		<DisplayFieldRef id="BLOOD_GLUCOSE_TIME"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="PETMRSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="XNAT_PETMRSESSIONDATA_PROJECT_IDENTIFIER"/>
-		<DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-		<DisplayFieldRef id="COIL"/>
-		<DisplayFieldRef id="FIELDSTRENGTH"/>
-		<DisplayFieldRef id="MARKER"/>
-		<DisplayFieldRef id="STABILIZATION"/>
-		<DisplayFieldRef id="STUDYTYPE"/>
-		<DisplayFieldRef id="PATIENTID"/>
-		<DisplayFieldRef id="PATIENTNAME"/>
-		<DisplayFieldRef id="TRACER_DOSE_UNITS"/>
-		<DisplayFieldRef id="TRACER_DOSE"/>
-		<DisplayFieldRef id="TRACER_SPECIFICACTIVITY"/>
-		<DisplayFieldRef id="TRACER_TOTALMASS_UNITS"/>
-		<DisplayFieldRef id="TRACER_TOTALMASS"/>
-		<DisplayFieldRef id="TRACER_INTERMEDIATE_UNITS"/>
-		<DisplayFieldRef id="TRACER_INTERMEDIATE"/>
-		<DisplayFieldRef id="TRACER_ISOTOPE_HALF_LIFE"/>
-		<DisplayFieldRef id="TRACER_ISOTOPE"/>
-		<DisplayFieldRef id="TRACER_TRANSMISSIONS"/>
-		<DisplayFieldRef id="TRACER_TRANSMISSIONS_STARTTIME"/>
-		<DisplayFieldRef id="TRACER_NAME"/>
-		<DisplayFieldRef id="TRACER_STARTTIME"/>
-		<DisplayFieldRef id="START_TIME"/>
-		<DisplayFieldRef id="START_TIME_SCAN"/>
-		<DisplayFieldRef id="START_TIME_INJECTION"/>
-		<DisplayFieldRef id="BLOOD_GLUCOSE"/>
-		<DisplayFieldRef id="BLOOD_GLUCOSE_UNITS"/>
-		<DisplayFieldRef id="BLOOD_GLUCOSE_TIME"/>
-	</DisplayVersion>
-	<ViewLink alias="XNAT_PETMRSESSIONDATA_PROJECTS">
-		<Mapping TableName="XNAT_PETMRSESSIONDATA_PROJECTS">
-			<MappingColumn rootElement="xnat:petmrSessionData" fieldElement="xnat:petmrSessionData.ID" mapsTo="id"/>
-		</Mapping>
-	</ViewLink>
-	<SQLView name="XNAT_PETMRSESSIONDATA_PROJECTS" sql="SELECT id, '&lt;' || expt.project || '&gt;' || xs_a_concat(',&lt;' || shared.project || '&gt;') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:petmrSessionData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_projectData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_projectData_display.xml
deleted file mode 100644
index 8a1921c8..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_projectData_display.xml
+++ /dev/null
@@ -1,277 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ D:/Development/XNAT/1.6/xnat_builder_1_6dev/plugin-resources/project-skeletons/xnat/src/schemas/xnat/display/xnat_projectData_display.xml
-  ~ XNAT http://www.xnat.org
-  ~ Copyright (c) 2014, Washington University School of Medicine
-  ~ All Rights Reserved
-  ~
-  ~ Released under the Simplified BSD.
-  ~
-  ~ Last modified 2/7/14 12:19 PM
-  -->
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:projectData" full-description="Project" brief-description="Project">
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:projectData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:projectData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayField id="ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:projectData/ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:projectData/search_field/xnat:projectData.ID">
-				<InsertValue id="Field1" field="ID"/>
-			</Property>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:projectData','xnat:projectData.ID');">
-				<InsertValue id="Field1" field="ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="NAME" header="Title" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:projectData/name"/>
-		<HTML-Link>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:projectData/search_field/xnat:projectData.ID">
-				<InsertValue id="Field1" field="ID"/>
-			</Property>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:projectData','xnat:projectData.ID');">
-				<InsertValue id="Field1" field="ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="NAME_CSV" header="Title" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:projectData/name"/>
-		<HTML-Link>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:projectData/search_field/xnat:projectData.ID">
-				<InsertValue id="Field1" field="ID"/>
-			</Property>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:projectData','xnat:projectData.ID');">
-				<InsertValue id="Field1" field="ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="DESCRIPTION" header="Description" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:projectData/description"/>
-		<Content type="sql">substring(@Field1 FROM 0 FOR 162)</Content>
-	</DisplayField>
-	<DisplayField id="DESCRIPTION_CSV" header="Description" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:projectData/description"/>
-	</DisplayField>
-	<DisplayField id="SECONDARY_ID" header="Running Title" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:projectData/secondary_ID"/>
-	</DisplayField>
-	<DisplayField id="KEYWORDS" header="Keywords" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:projectData/keywords"/>
-	</DisplayField>
-	<DisplayField id="PI" header="PI" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:projectData/PI/firstname"/>
-		<DisplayFieldElement name="Field2" schema-element="xnat:projectData/PI/lastname"/>
-		<Content type="sql">@Field1 || ' ' || @Field2</Content>
-	</DisplayField>
-	<DisplayField id="PROJECT_INVS" header="Investigators" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" viewName="PROJECT_INVS" viewColumn="PROJ_INVS"/>
-	</DisplayField>
-	<DisplayField id="PROJECT_ACCESS" header="Accessibility" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" viewName="PROJECT_ACCESS" viewColumn="accessibility"/>
-	</DisplayField>
-	<DisplayField id="PROJECT_USERS" header="Users" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" viewName="PROJECT_USERS" viewColumn="users"/>
-	</DisplayField>
-	<DisplayField id="PROJECT_OWNERS" header="Owners" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" viewName="PROJECT_OWNERS" viewColumn="users"/>
-	</DisplayField>
-	<DisplayField id="PROJECT_MEMBERS" header="Members" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" viewName="PROJECT_MEMBERS" viewColumn="users"/>
-	</DisplayField>
-	<DisplayField id="PROJECT_COLLABS" header="Collaborators" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" viewName="PROJECT_COLLABS" viewColumn="users"/>
-	</DisplayField>
-	<DisplayField id="PROJECT_LAST_WORKFLOW" header="Last Workflow" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" viewName="PROJECT_LAST_WORKFLOW" viewColumn="LAST_WORKFLOW"/>
-	</DisplayField>
-	<DisplayField id="PROJECT_LAST_ACCESS" header="Last Access" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" viewName="PROJECT_LAST_ACCESS" viewColumn="users"/>
-	</DisplayField>
-	<DisplayField id="PROJECT_FAV" header="Favorites" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" viewName="PROJECT_FAVS" viewColumn="users"/>
-	</DisplayField>
-	<DisplayField id="PROJECT_ACCESS_IMG" header="Access" visible="true"  image="true">
-		<DisplayFieldElement name="Field1" viewName="PROJECT_ACCESS" viewColumn="accessibility"/>
-		<Content type="sql">CASE @Field1 WHEN 'public' THEN '/@WEBAPPimages/globe.gif' ELSE '/@WEBAPPimages/key.gif' END</Content>
-	</DisplayField>
-	<DisplayField id="USER_ROLE" header="Role" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">project_role</Content>
-		<SubQuery>SELECT tag AS project_id, displayname AS project_role FROM xdat_userGroup grp LEFT JOIN xdat_user_groupid map ON grp.id=map.groupid WHERE map.groups_groupid_xdat_user_xdat_user_id=@WHERE</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:projectData.ID" queryField="project_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayField id="LAST_ACCESSED" header="Last Accessed" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">accessed</Content>
-		<SubQuery>SELECT DISTINCT ON (search_value) search_value AS project_id,accessed FROM xdat_search.xs_item_access WHERE xdat_user_id::text=@WHERE::text ORDER BY project_id ASC,accessed DESC</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:projectData.ID" queryField="project_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayField id="PROJ_EXPT_COUNT" header="Count" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">sub_project_count</Content>
-		<SubQuery>SELECT COUNT(*) as sub_project_count, subject_id FROM xnat_subjectAssessorData sad LEFT JOIN xnat_experimentData ex ON sad.ID=ex.ID JOIN xdat_meta_element xme ON ex.extension=xme.xdat_meta_element_id WHERE xme.element_name='@WHERE' GROUP BY subject_id</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:subjectData.ID" queryField="subject_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayField id="PROJ_MR_COUNT" header="MR Count" visible="true" searchable="true" data-type="integer">
-		<DisplayFieldElement name="Field1" viewName="PROJ_MR_COUNTS" viewColumn="PROJ_EXPT_COUNT"/>
-	</DisplayField>
-	<DisplayField id="PROJ_CT_COUNT" header="CT Count" visible="true" searchable="true" data-type="integer">
-		<DisplayFieldElement name="Field1" viewName="PROJ_CT_COUNTS" viewColumn="PROJ_EXPT_COUNT"/>
-	</DisplayField>
-	<DisplayField id="PROJ_PET_COUNT" header="PET Count" visible="true" searchable="true" data-type="integer">
-		<DisplayFieldElement name="Field1" viewName="PROJ_PET_COUNTS" viewColumn="PROJ_EXPT_COUNT"/>
-	</DisplayField>
-	<DisplayField id="PROJ_UT_COUNT" header="UT Count" visible="true" searchable="true" data-type="integer">
-		<DisplayFieldElement name="Field1" viewName="PROJ_UT_COUNTS" viewColumn="PROJ_EXPT_COUNT"/>
-	</DisplayField>
-	<DisplayField id="PROJ_QUARANTINE" header="Quarantine Code" visible="true" data-type="integer">
-		<DisplayFieldElement name="Field1" viewName="PROJ_ARC" viewColumn="quarantine_code"/>
-	</DisplayField>
-	<DisplayField id="PROJ_PREARCHIVE_CODE" header="Prearchive Code" visible="true" data-type="integer">
-		<DisplayFieldElement name="Field1" viewName="PROJ_ARC" viewColumn="prearchive_code"/>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="ID" default-sort-order="DESC" brief-description="Project" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="NAME"/>
-		<DisplayFieldRef id="DESCRIPTION"/>
-		<DisplayFieldRef id="SECONDARY_ID"/>
-		<DisplayFieldRef id="KEYWORDS"/>
-		<DisplayFieldRef id="PROJ_MR_COUNT"/>
-		<DisplayFieldRef id="PROJ_PET_COUNT"/>
-		<DisplayFieldRef id="PROJ_CT_COUNT"/>
-		<DisplayFieldRef id="USER_ROLE" value="{XDAT_USER_ID}" visible="false"/>
-		<DisplayFieldRef id="PROJECT_ACCESS" visible="false"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="ID" default-sort-order="DESC" brief-description="Project" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="NAME"/>
-		<DisplayFieldRef id="DESCRIPTION"/>
-		<DisplayFieldRef id="SECONDARY_ID"/>
-		<DisplayFieldRef id="KEYWORDS"/>
-		<DisplayFieldRef id="PROJ_MR_COUNT"/>
-		<DisplayFieldRef id="PROJ_PET_COUNT"/>
-		<DisplayFieldRef id="PROJ_CT_COUNT"/>
-		<DisplayFieldRef id="USER_ROLE" value="{XDAT_USER_ID}" visible="false"/>
-		<DisplayFieldRef id="PROJECT_ACCESS" visible="false"/>
-	</DisplayVersion>
-	<ViewLink alias="PROJECT_INVS">
-		<Mapping TableName="PROJECT_INVS">
-			<MappingColumn rootElement="xnat:projectData" fieldElement="xnat:projectData.ID" mapsTo="xnat_projectdata_id"/>
-		</Mapping>
-	</ViewLink>
-	<ViewLink alias="PROJECT_ACCESS">
-		<Mapping TableName="PROJECT_ACCESS">
-			<MappingColumn rootElement="xnat:projectData" fieldElement="xnat:projectData.ID" mapsTo="id"/>
-		</Mapping>
-	</ViewLink>
-	<ViewLink alias="PROJECT_USERS">
-		<Mapping TableName="PROJECT_USERS">
-			<MappingColumn rootElement="xnat:projectData" fieldElement="xnat:projectData.ID" mapsTo="xnat_projectdata_id"/>
-		</Mapping>
-	</ViewLink>
-	<ViewLink alias="PROJECT_OWNERS">
-		<Mapping TableName="PROJECT_OWNERS">
-			<MappingColumn rootElement="xnat:projectData" fieldElement="xnat:projectData.ID" mapsTo="xnat_projectdata_id"/>
-		</Mapping>
-	</ViewLink>
-	<ViewLink alias="PROJECT_MEMBERS">
-		<Mapping TableName="PROJECT_MEMBERS">
-			<MappingColumn rootElement="xnat:projectData" fieldElement="xnat:projectData.ID" mapsTo="xnat_projectdata_id"/>
-		</Mapping>
-	</ViewLink>
-	<ViewLink alias="PROJECT_COLLABS">
-		<Mapping TableName="PROJECT_COLLABS">
-			<MappingColumn rootElement="xnat:projectData" fieldElement="xnat:projectData.ID" mapsTo="xnat_projectdata_id"/>
-		</Mapping>
-	</ViewLink>
-	<ViewLink alias="PROJECT_LAST_WORKFLOW">
-		<Mapping TableName="PROJECT_LAST_WORKFLOW">
-			<MappingColumn rootElement="xnat:projectData" fieldElement="xnat:projectData.ID" mapsTo="id"/>
-		</Mapping>
-	</ViewLink>
-	<ViewLink alias="PROJECT_LAST_ACCESS">
-		<Mapping TableName="PROJECT_LAST_ACCESS">
-			<MappingColumn rootElement="xnat:projectData" fieldElement="xnat:projectData.ID" mapsTo="search_value"/>
-		</Mapping>
-	</ViewLink>
-	<ViewLink alias="PROJECT_FAVS">
-		<Mapping TableName="PROJECT_FAVS">
-			<MappingColumn rootElement="xnat:projectData" fieldElement="xnat:projectData.ID" mapsTo="project_id"/>
-		</Mapping>
-	</ViewLink>
-	<ViewLink alias="PROJ_MR_COUNTS">
-		<Mapping TableName="PROJ_MR_COUNTS">
-			<MappingColumn rootElement="xnat:projectData" fieldElement="xnat:projectData.ID" mapsTo="project"/>
-		</Mapping>
-	</ViewLink>
-	<ViewLink alias="PROJ_CT_COUNTS">
-		<Mapping TableName="PROJ_CT_COUNTS">
-			<MappingColumn rootElement="xnat:projectData" fieldElement="xnat:projectData.ID" mapsTo="project"/>
-		</Mapping>
-	</ViewLink>
-	<ViewLink alias="PROJ_UT_COUNTS">
-		<Mapping TableName="PROJ_UT_COUNTS">
-			<MappingColumn rootElement="xnat:projectData" fieldElement="xnat:projectData.ID" mapsTo="project"/>
-		</Mapping>
-	</ViewLink>
-	<ViewLink alias="PROJ_PET_COUNTS">
-		<Mapping TableName="PROJ_PET_COUNTS">
-			<MappingColumn rootElement="xnat:projectData" fieldElement="xnat:projectData.ID" mapsTo="project"/>
-		</Mapping>
-	</ViewLink>
-	<ViewLink alias="PROJ_ARC">
-		<Mapping TableName="PROJ_ARC">
-			<MappingColumn rootElement="xnat:projectData" fieldElement="xnat:projectData.ID" mapsTo="PROJ_ID"/>
-		</Mapping>
-	</ViewLink>
-	<SQLView name="PROJECT_INVS" sql="SELECT proj.id AS xnat_projectdata_id, COALESCE(((pi.lastname::text || ', '::text) || pi.firstname::text),'') || COALESCE(others.other_invs,'') AS proj_invs FROM xnat_projectData proj LEFT JOIN xnat_investigatorData pi ON proj.pi_xnat_investigatorData_id=pi.xnat_investigatorData_id LEFT JOIN (  SELECT xnat_projectdata_id, xs_a_concat(' &lt;br/&gt; ' || lastname || ', ' || firstname) AS other_invs   FROM xnat_projectData_investigator pinv  LEFT JOIN xnat_investigatorData inv ON pinv.xnat_investigatordata_xnat_investigatordata_id=inv.xnat_investigatordata_id  GROUP BY xnat_projectdata_id) others ON proj.id=xnat_projectdata_id"/>
-	<SQLView name="PROJECT_ACCESS" sql="SELECT proj.id,CASE WHEN (project_read=1 AND subject_read=1) THEN 'public' WHEN (project_read=1) THEN 'protected' ELSE 'private' END AS accessibility FROM xnat_projectData proj LEFT JOIN ( SELECT field_value,read_element AS project_read FROM xdat_element_access ea LEFT JOIN xdat_field_mapping_set fms ON ea.xdat_element_access_id=fms.permissions_allow_set_xdat_elem_xdat_element_access_id LEFT JOIN xdat_user u ON ea.xdat_user_xdat_user_id=u.xdat_user_id LEFT JOIN xdat_field_mapping fm ON fms.xdat_field_mapping_set_id=fm.xdat_field_mapping_set_xdat_field_mapping_set_id WHERE login='guest' AND element_name='xnat:projectData'  )project_read ON proj.id=project_read.field_value LEFT JOIN ( SELECT field_value,read_element AS subject_read FROM xdat_element_access ea LEFT JOIN xdat_field_mapping_set fms ON ea.xdat_element_access_id=fms.permissions_allow_set_xdat_elem_xdat_element_access_id LEFT JOIN xdat_user u ON ea.xdat_user_xdat_user_id=u.xdat_user_id LEFT JOIN xdat_field_mapping fm ON fms.xdat_field_mapping_set_id=fm.xdat_field_mapping_set_xdat_field_mapping_set_id WHERE login='guest' AND field='xnat:subjectData/project'  )subject_read ON proj.id=subject_read.field_value"/>
-	<SQLView name="PROJECT_USERS" sql="SELECT FIELD_VALUE AS xnat_projectdata_id, TRIM('&lt;br/&gt;' FROM xs_a_concat( ' '|| login || ' &lt;br/&gt;')) AS users FROM (SELECT DISTINCT FIELD_VALUE,login FROM xdat_element_access ea  LEFT JOIN xdat_field_mapping_set fms ON ea.xdat_element_access_id=fms.permissions_allow_set_xdat_elem_xdat_element_access_id  LEFT JOIN xdat_field_mapping fm ON fms.xdat_field_mapping_set_id=fm.xdat_field_mapping_set_xdat_field_mapping_set_id  RIGHT JOIN xdat_userGroup grp ON ea.xdat_usergroup_xdat_usergroup_id=grp.xdat_usergroup_id  RIGHT JOIN xdat_user_groupid map ON grp.id=map.groupid RIGHT JOIN xdat_user u ON map.groups_groupid_xdat_user_xdat_user_id=u.xdat_user_id WHERE field='xnat:subjectData/sharing/share/project') PROJ_USERS GROUP BY FIELD_VALUE"/>
-	<SQLView name="PROJECT_OWNERS" sql="SELECT FIELD_VALUE AS xnat_projectdata_id, TRIM('&lt;br/&gt;' FROM xs_a_concat( ' '|| login || ' &lt;br/&gt;')) AS users FROM (SELECT DISTINCT FIELD_VALUE,login FROM xdat_element_access ea  LEFT JOIN xdat_field_mapping_set fms ON ea.xdat_element_access_id=fms.permissions_allow_set_xdat_elem_xdat_element_access_id  LEFT JOIN xdat_field_mapping fm ON fms.xdat_field_mapping_set_id=fm.xdat_field_mapping_set_xdat_field_mapping_set_id  RIGHT JOIN xdat_userGroup grp ON ea.xdat_usergroup_xdat_usergroup_id=grp.xdat_usergroup_id AND grp.displayname='Owners'  RIGHT JOIN xdat_user_groupid map ON grp.id=map.groupid RIGHT JOIN xdat_user u ON map.groups_groupid_xdat_user_xdat_user_id=u.xdat_user_id WHERE field='xnat:subjectData/sharing/share/project') PROJ_USERS GROUP BY FIELD_VALUE"/>
-	<SQLView name="PROJECT_MEMBERS" sql="SELECT FIELD_VALUE AS xnat_projectdata_id, TRIM('&lt;br/&gt;' FROM xs_a_concat( ' '|| login || ' &lt;br/&gt;')) AS users FROM (SELECT DISTINCT FIELD_VALUE,login FROM xdat_element_access ea  LEFT JOIN xdat_field_mapping_set fms ON ea.xdat_element_access_id=fms.permissions_allow_set_xdat_elem_xdat_element_access_id  LEFT JOIN xdat_field_mapping fm ON fms.xdat_field_mapping_set_id=fm.xdat_field_mapping_set_xdat_field_mapping_set_id  RIGHT JOIN xdat_userGroup grp ON ea.xdat_usergroup_xdat_usergroup_id=grp.xdat_usergroup_id AND grp.displayname='Members'  RIGHT JOIN xdat_user_groupid map ON grp.id=map.groupid RIGHT JOIN xdat_user u ON map.groups_groupid_xdat_user_xdat_user_id=u.xdat_user_id WHERE field='xnat:subjectData/sharing/share/project') PROJ_USERS GROUP BY FIELD_VALUE"/>
-	<SQLView name="PROJECT_COLLABS" sql="SELECT FIELD_VALUE AS xnat_projectdata_id, TRIM('&lt;br/&gt;' FROM xs_a_concat( ' '|| login || ' &lt;br/&gt;')) AS users FROM (SELECT DISTINCT FIELD_VALUE,login FROM xdat_element_access ea  LEFT JOIN xdat_field_mapping_set fms ON ea.xdat_element_access_id=fms.permissions_allow_set_xdat_elem_xdat_element_access_id  LEFT JOIN xdat_field_mapping fm ON fms.xdat_field_mapping_set_id=fm.xdat_field_mapping_set_xdat_field_mapping_set_id  RIGHT JOIN xdat_userGroup grp ON ea.xdat_usergroup_xdat_usergroup_id=grp.xdat_usergroup_id AND grp.displayname='Collaborators'  RIGHT JOIN xdat_user_groupid map ON grp.id=map.groupid RIGHT JOIN xdat_user u ON map.groups_groupid_xdat_user_xdat_user_id=u.xdat_user_id WHERE field='xnat:subjectData/sharing/share/project') PROJ_USERS GROUP BY FIELD_VALUE"/>
-	<SQLView name="PROJECT_LAST_WORKFLOW" sql="SELECT ID, LAST_WORKFLOW FROM xnat_projectData proj LEFT JOIN (SELECT externalid,MAX(launch_time) as LAST_WORKFLOW FROM wrk_workflowData GROUP BY externalid)launch_times ON proj.id=launch_times.externalid"/>
-	<SQLView name="PROJECT_LAST_ACCESS" sql="SELECT search_value,TRIM('&lt;br/&gt;' FROM xs_a_concat( ' '|| login || ' &lt;br/&gt;')) AS users FROM (SELECT DISTINCT search_value,xdat_user_id FROM xdat_search.xs_item_access WHERE search_element='xnat:projectData' AND accessed > (NOW()-interval '1 month')) last_access LEFT JOIN xdat_user u ON last_access.xdat_user_id::text=u.xdat_user_id::text GROUP BY search_value"/>
-	<SQLView name="PROJECT_FAVS" sql="SELECT id AS project_id,TRIM('&lt;br/&gt;' FROM xs_a_concat( ' '|| login || ' &lt;br/&gt;')) AS users FROM (   SELECT DISTINCT id,xdat_user_id    FROM xdat_search.xs_fav_entries   WHERE dataType='Project' ) last_access  LEFT JOIN xdat_user u ON last_access.xdat_user_id::integer=u.xdat_user_id::integer GROUP BY id"/>
-	<SQLView name="PROJ_EXPT_COUNTS" sql="SELECT project, element_name, COUNT(ID) AS PROJ_EXPT_COUNT FROM (
-SELECT project,ID,element_name FROM xnat_experimentData expt LEFT JOIN xdat_meta_element xme ON expt.extension=xme.xdat_meta_element_id
-UNION
-SELECT ep.project, ep.label, element_name FROM xnat_experimentdata_share ep LEFT JOIN xnat_experimentData expt ON ep.sharing_share_xnat_experimentda_id=expt.id LEFT JOIN xdat_meta_element xme ON expt.extension=xme.xdat_meta_element_id
-) GROUPING GROUP BY project,element_name"/>
-	<SQLView name="PROJ_MR_COUNTS" sql="SELECT project, proj_expt_count FROM (
-SELECT project, element_name, COUNT(ID) AS PROJ_EXPT_COUNT FROM (
-SELECT project,ID,element_name FROM xnat_experimentData expt LEFT JOIN xdat_meta_element xme ON expt.extension=xme.xdat_meta_element_id
-UNION
-SELECT ep.project, ep.label, element_name FROM xnat_experimentdata_share ep LEFT JOIN xnat_experimentData expt ON ep.sharing_share_xnat_experimentda_id=expt.id LEFT JOIN xdat_meta_element xme ON expt.extension=xme.xdat_meta_element_id
-) GROUPING GROUP BY project,element_name
-) GROUPING WHERE element_name='xnat:mrSessionData'"/>
-	<SQLView name="PROJ_PET_COUNTS" sql="SELECT project, proj_expt_count FROM (
-SELECT project, element_name, COUNT(ID) AS PROJ_EXPT_COUNT FROM (
-SELECT project,ID,element_name FROM xnat_experimentData expt LEFT JOIN xdat_meta_element xme ON expt.extension=xme.xdat_meta_element_id
-UNION
-SELECT ep.project, ep.label, element_name FROM xnat_experimentdata_share ep LEFT JOIN xnat_experimentData expt ON ep.sharing_share_xnat_experimentda_id=expt.id LEFT JOIN xdat_meta_element xme ON expt.extension=xme.xdat_meta_element_id
-) GROUPING GROUP BY project,element_name
-) GROUPING WHERE element_name='xnat:petSessionData'"/>
-	<SQLView name="PROJ_CT_COUNTS" sql="SELECT project, proj_expt_count FROM (
-SELECT project, element_name, COUNT(ID) AS PROJ_EXPT_COUNT FROM (
-SELECT project,ID,element_name FROM xnat_experimentData expt LEFT JOIN xdat_meta_element xme ON expt.extension=xme.xdat_meta_element_id
-UNION
-SELECT ep.project, ep.label, element_name FROM xnat_experimentdata_share ep LEFT JOIN xnat_experimentData expt ON ep.sharing_share_xnat_experimentda_id=expt.id LEFT JOIN xdat_meta_element xme ON expt.extension=xme.xdat_meta_element_id
-) GROUPING GROUP BY project,element_name
-) GROUPING WHERE element_name='xnat:ctSessionData'"/>
-	<SQLView name="PROJ_UT_COUNTS" sql="SELECT project, proj_expt_count FROM (
-SELECT project, element_name, COUNT(ID) AS PROJ_EXPT_COUNT FROM (
-SELECT project,ID,element_name FROM xnat_experimentData expt LEFT JOIN xdat_meta_element xme ON expt.extension=xme.xdat_meta_element_id
-UNION
-SELECT ep.project, ep.label, element_name FROM xnat_experimentdata_share ep LEFT JOIN xnat_experimentData expt ON ep.sharing_share_xnat_experimentda_id=expt.id LEFT JOIN xdat_meta_element xme ON expt.extension=xme.xdat_meta_element_id
-) GROUPING GROUP BY project,element_name
-) GROUPING WHERE element_name='xnat:utSessionData'"/>
-	<SQLView name="PROJ_ARC" sql="SELECT id AS PROJ_ID,current_arc,COALESCE(quarantine_code,0) AS quarantine_code,COALESCE(prearchive_code,0) AS prearchive_code FROM arc_project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_qcAssessmentData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_qcAssessmentData_display.xml
deleted file mode 100644
index 68a766bb..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_qcAssessmentData_display.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:qcAssessmentData" full-description="QCAssessment" brief-description="QCAssessment">
-	<Arc name="ASSESSOR">
-		<CommonField id="EXPT_ID" local-field="EXPT_ID"/>
-		<CommonField id="ASSESSED_EXPT_ID" local-field="SESSION_ID"/>
-	</Arc>
-	<Arc name="PARTICIPANT_EXPERIMENT">
-		<CommonField id="PART_ID" local-field="SUBJECT_ID"/>
-		<CommonField id="DATE" local-field="MR_DATE"/>
-		<CommonField id="EXPT_ID" local-field="EXPT_ID"/>
-	</Arc>
-	<DisplayField id="SESSION_ID" header="Session" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:qcAssessmentData.imageSession_ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:mrSessionData','xnat:mrSessionData.ID');">
-				<InsertValue id="Field1" field="SESSION_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrSessionData.subject_ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
-				<InsertValue id="Field1" field="SUBJECT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="MR_DATE" header="MR Date" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:mrSessionData.date"/>
-	</DisplayField>
-	<DisplayField id="EXPT_ID" header="ID" visible="false" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:qcAssessmentData.ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:qcAssessmentData','xnat:qcAssessmentData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="RPT" header="ID" visible="true" image="true">
-		<Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:qcAssessmentData','xnat:qcAssessmentData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="DATE" header="Date" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:qcAssessmentData.date"/>
-	</DisplayField>
-	<DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
-	<DisplayFieldElement name="Field1" schema-element="xnat:mrSessionData.date"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
-	<DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
-	<Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
-	</DisplayField>
-	<DisplayField header="Projects" id="PROJECTS" data-type="string">
-		<DisplayFieldElement name="Field1" viewName="XNAT_QCASSESSMENTDATA_PROJECTS" viewColumn="PROJECTS"/>
-	</DisplayField>
-	<DisplayField header="Label" id="LABEL" data-type="string">
-	<DisplayFieldElement name="Field1" schema-element="xnat:qcAssessmentData.ID"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:qcAssessmentData.label"/>
-	<Content type="sql">COALESCE(@Field2, @Field1)</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:qcAssessmentData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:qcAssessmentData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:qcAssessmentData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:qcAssessmentData/search_field/xnat:qcAssessmentData.ID">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:qcAssessmentData','xnat:qcAssessmentData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="TITLE" value="Inserted: @Field1 (@Field2)">
-				<InsertValue id="Field1" field="INSERT_DATE"/>
-				<InsertValue id="Field2" field="INSERT_USER"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:qcAssessmentData.project"/>
-	</DisplayField>
-	<DisplayField id="XNAT_QCASSESSMENTDATA_PROJECT_IDENTIFIER" header="XNAT_QCASSESSMENTDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">xnat_qcassessmentdata_project_id</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:qcAssessmentData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:qcAssessmentData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:qcAssessmentData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:qcAssessmentData/search_field/xnat:qcAssessmentData.ID/project/@Field2">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-				<InsertValue id="Field2" field="@WHERE"/>
-			</Property>
-		</HTML-Link>
-		<SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_qcassessmentdata_project_id,sharing_share_xnat_experimentda_id FROM (	SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE'	UNION 	SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:qcAssessmentData.ID" queryField="sharing_share_xnat_experimentda_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayField id="XNAT_QCASSESSMENTDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">field</Content>
-		<SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:qcAssessmentData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:qcAssessmentData.ID" queryField="expt_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:qcAssessmentData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:qcAssessmentData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayField id="TYPE" header="type" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:qcAssessmentData/type"/>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="QCAssessment" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="RPT"/>
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="LABEL"  element_name="xnat:mrSessionData"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="TYPE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="QCAssessment" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="EXPT_ID"/>
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="LABEL"  element_name="xnat:mrSessionData"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="TYPE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="QCAssessment" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="EXPT_ID"/>
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="LABEL"  element_name="xnat:mrSessionData"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="TYPE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="QCAssessment" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="TYPE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="QCAssessment" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="XNAT_QCASSESSMENTDATA_PROJECT_IDENTIFIER"/>
-		<DisplayFieldRef id="MR_PROJECT_IDENTIFIER" element_name="xnat:mrSessionData"/>
-		<DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="TYPE"/>
-	</DisplayVersion>
-	<ViewLink alias="XNAT_QCASSESSMENTDATA_PROJECTS">
-		<Mapping TableName="XNAT_QCASSESSMENTDATA_PROJECTS">
-			<MappingColumn rootElement="xnat:qcAssessmentData" fieldElement="xnat:qcAssessmentData.ID" mapsTo="id"/>
-		</Mapping>
-	</ViewLink>
-	<SQLView name="XNAT_QCASSESSMENTDATA_PROJECTS" sql="SELECT id, '&lt;' || expt.project || '&gt;' || xs_a_concat(',&lt;' || shared.project || '&gt;') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:qcAssessmentData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_qcManualAssessorData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_qcManualAssessorData_display.xml
deleted file mode 100644
index 1e17af64..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_qcManualAssessorData_display.xml
+++ /dev/null
@@ -1,180 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:qcManualAssessorData" full-description="QCManualAssessment" brief-description="QCManualAssessment">
-	<DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:qcManualAssessorData.ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:qcManualAssessorData','xnat:qcManualAssessorData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="RPT" header="ID" visible="true" image="true">
-		<Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:qcManualAssessorData','xnat:qcManualAssessorData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="DATE" header="Date" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:qcManualAssessorData.date"/>
-	</DisplayField>
-	<DisplayField header="Projects" id="PROJECTS" data-type="string">
-		<DisplayFieldElement name="Field1" viewName="XNAT_QCMANUALASSESSORDATA_PROJECTS" viewColumn="PROJECTS"/>
-	</DisplayField>
-	<DisplayField header="Label" id="LABEL" data-type="string">
-	<DisplayFieldElement name="Field1" schema-element="xnat:qcManualAssessorData.ID"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:qcManualAssessorData.label"/>
-	<Content type="sql">COALESCE(@Field2, @Field1)</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:qcManualAssessorData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:qcManualAssessorData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:qcManualAssessorData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:qcManualAssessorData/search_field/xnat:qcManualAssessorData.ID">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:qcManualAssessorData','xnat:qcManualAssessorData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="TITLE" value="Inserted: @Field1 (@Field2)">
-				<InsertValue id="Field1" field="INSERT_DATE"/>
-				<InsertValue id="Field2" field="INSERT_USER"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:qcManualAssessorData.project"/>
-	</DisplayField>
-	<DisplayField id="XNAT_QCMANUALASSESSORDATA_PROJECT_IDENTIFIER" header="XNAT_QCMANUALASSESSORDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">xnat_qcmanualassessordata_project_id</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:qcManualAssessorData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:qcManualAssessorData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:qcManualAssessorData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:qcManualAssessorData/search_field/xnat:qcManualAssessorData.ID/project/@Field2">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-				<InsertValue id="Field2" field="@WHERE"/>
-			</Property>
-		</HTML-Link>
-		<SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_qcmanualassessordata_project_id,sharing_share_xnat_experimentda_id FROM (	SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE'	UNION 	SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:qcManualAssessorData.ID" queryField="sharing_share_xnat_experimentda_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:qcManualAssessorData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:qcManualAssessorData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayField id="XNAT_QCMANUALASSESSORDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">field</Content>
-		<SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:qcManualAssessorData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:qcManualAssessorData.ID" queryField="expt_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayField id="RATER" header="rater" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:qcManualAssessorData/rater"/>
-	</DisplayField>
-	<DisplayField id="STEREOTACTICMARKER" header="stereotacticMarker" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:qcManualAssessorData/stereotacticMarker"/>
-	</DisplayField>
-	<DisplayField id="INCIDENTALFINDINGS" header="incidentalFindings" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:qcManualAssessorData/incidentalFindings"/>
-	</DisplayField>
-	<DisplayField id="COMMENTS" header="comments" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:qcManualAssessorData/comments"/>
-	</DisplayField>
-	<DisplayField id="PASS" header="pass" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:qcManualAssessorData/pass"/>
-	</DisplayField>
-	<DisplayField id="PAYABLE" header="payable" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:qcManualAssessorData/payable"/>
-	</DisplayField>
-	<DisplayField id="RESCAN" header="rescan" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:qcManualAssessorData/rescan"/>
-	</DisplayField>
-	<DisplayField id="RESOLVABLE" header="resolvable" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:qcManualAssessorData/resolvable"/>
-	</DisplayField>
-	<DisplayField id="RETRAIN" header="retrain" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:qcManualAssessorData/retrain"/>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="QCManualAssessment" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="RPT"/>
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="RATER"/>
-		<DisplayFieldRef id="STEREOTACTICMARKER"/>
-		<DisplayFieldRef id="INCIDENTALFINDINGS"/>
-		<DisplayFieldRef id="COMMENTS"/>
-		<DisplayFieldRef id="PASS"/>
-		<DisplayFieldRef id="PAYABLE"/>
-		<DisplayFieldRef id="RESCAN"/>
-		<DisplayFieldRef id="RESOLVABLE"/>
-		<DisplayFieldRef id="RETRAIN"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="QCManualAssessment" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="RATER"/>
-		<DisplayFieldRef id="STEREOTACTICMARKER"/>
-		<DisplayFieldRef id="INCIDENTALFINDINGS"/>
-		<DisplayFieldRef id="COMMENTS"/>
-		<DisplayFieldRef id="PASS"/>
-		<DisplayFieldRef id="PAYABLE"/>
-		<DisplayFieldRef id="RESCAN"/>
-		<DisplayFieldRef id="RESOLVABLE"/>
-		<DisplayFieldRef id="RETRAIN"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="QCManualAssessment" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="EXPT_ID"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="RATER"/>
-		<DisplayFieldRef id="STEREOTACTICMARKER"/>
-		<DisplayFieldRef id="INCIDENTALFINDINGS"/>
-		<DisplayFieldRef id="COMMENTS"/>
-		<DisplayFieldRef id="PASS"/>
-		<DisplayFieldRef id="PAYABLE"/>
-		<DisplayFieldRef id="RESCAN"/>
-		<DisplayFieldRef id="RESOLVABLE"/>
-		<DisplayFieldRef id="RETRAIN"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="QCManualAssessment" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="EXPT_ID"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="RATER"/>
-		<DisplayFieldRef id="STEREOTACTICMARKER"/>
-		<DisplayFieldRef id="INCIDENTALFINDINGS"/>
-		<DisplayFieldRef id="COMMENTS"/>
-		<DisplayFieldRef id="PASS"/>
-		<DisplayFieldRef id="PAYABLE"/>
-		<DisplayFieldRef id="RESCAN"/>
-		<DisplayFieldRef id="RESOLVABLE"/>
-		<DisplayFieldRef id="RETRAIN"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="QCManualAssessment" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="XNAT_QCMANUALASSESSORDATA_PROJECT_IDENTIFIER"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="RATER"/>
-		<DisplayFieldRef id="STEREOTACTICMARKER"/>
-		<DisplayFieldRef id="INCIDENTALFINDINGS"/>
-		<DisplayFieldRef id="COMMENTS"/>
-		<DisplayFieldRef id="PASS"/>
-		<DisplayFieldRef id="PAYABLE"/>
-		<DisplayFieldRef id="RESCAN"/>
-		<DisplayFieldRef id="RESOLVABLE"/>
-		<DisplayFieldRef id="RETRAIN"/>
-	</DisplayVersion>
-	<ViewLink alias="XNAT_QCMANUALASSESSORDATA_PROJECTS">
-		<Mapping TableName="XNAT_QCMANUALASSESSORDATA_PROJECTS">
-			<MappingColumn rootElement="xnat:qcManualAssessorData" fieldElement="xnat:qcManualAssessorData.ID" mapsTo="id"/>
-		</Mapping>
-	</ViewLink>
-	<SQLView name="XNAT_QCMANUALASSESSORDATA_PROJECTS" sql="SELECT id, '&lt;' || expt.project || '&gt;' || xs_a_concat(',&lt;' || shared.project || '&gt;') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:qcManualAssessorData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_reconstructedImageData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_reconstructedImageData_display.xml
deleted file mode 100644
index 47060bfb..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_reconstructedImageData_display.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:reconstructedImageData" full-description="ReconstructedImage" brief-description="ReconstructedImage">
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:reconstructedImageData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:reconstructedImageData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:reconstructedImageData/image_session_ID"/>
-	</DisplayField>
-	<DisplayField id="ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:reconstructedImageData/ID"/>
-	</DisplayField>
-	<DisplayField id="TYPE" header="type" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:reconstructedImageData/type"/>
-	</DisplayField>
-	<DisplayField id="BASESCANTYPE" header="baseScanType" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:reconstructedImageData/baseScanType"/>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="ReconstructedImage" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="BASESCANTYPE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="ReconstructedImage" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="BASESCANTYPE"/>
-	</DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_regionResource_display.xml b/src/main/webapp/schemas/xnat/display/xnat_regionResource_display.xml
deleted file mode 100644
index 4606164a..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_regionResource_display.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:regionResource" full-description="ImageRegionResource" brief-description="ImageRegionResource">
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:regionResource.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:regionResource.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayField id="CREATOR_FIRSTNAME" header="firstname" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:regionResource/creator/firstname"/>
-	</DisplayField>
-	<DisplayField id="CREATOR_LASTNAME" header="lastname" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:regionResource/creator/lastname"/>
-	</DisplayField>
-	<DisplayField id="NAME" header="name" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:regionResource/name"/>
-	</DisplayField>
-	<DisplayField id="HEMISPHERE" header="hemisphere" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:regionResource/hemisphere"/>
-	</DisplayField>
-	<DisplayField id="SESSION_ID" header="session_id" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:regionResource/session_id"/>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="CREATOR_FIRSTNAME" default-sort-order="DESC" brief-description="ImageRegionResource" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="CREATOR_FIRSTNAME"/>
-		<DisplayFieldRef id="CREATOR_LASTNAME"/>
-		<DisplayFieldRef id="NAME"/>
-		<DisplayFieldRef id="HEMISPHERE"/>
-		<DisplayFieldRef id="SESSION_ID"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="CREATOR_FIRSTNAME" default-sort-order="DESC" brief-description="ImageRegionResource" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="CREATOR_FIRSTNAME"/>
-		<DisplayFieldRef id="CREATOR_LASTNAME"/>
-		<DisplayFieldRef id="NAME"/>
-		<DisplayFieldRef id="HEMISPHERE"/>
-		<DisplayFieldRef id="SESSION_ID"/>
-	</DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_resourceCatalog_display.xml b/src/main/webapp/schemas/xnat/display/xnat_resourceCatalog_display.xml
deleted file mode 100644
index 6cc411c1..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_resourceCatalog_display.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:resourceCatalog" full-description="ResourceCatalog" brief-description="ResourceCatalog">
-	<DisplayField id="URI" header="URI" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:resourceCatalog/URI"/>
-	</DisplayField>
-	<DisplayField id="FORMAT" header="format" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:resourceCatalog/format"/>
-	</DisplayField>
-	<DisplayField id="DESCRIPTION" header="description" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:resourceCatalog/description"/>
-	</DisplayField>
-	<DisplayField id="CONTENT" header="content" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:resourceCatalog/content"/>
-	</DisplayField>
-	<DisplayField id="CACHEPATH" header="cachePath" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:resourceCatalog/cachePath"/>
-	</DisplayField>
-	<DisplayField id="NOTE" header="note" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:resourceCatalog/note"/>
-	</DisplayField>
-	<DisplayField id="LABEL" header="label" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:resourceCatalog/label"/>
-	</DisplayField>
-	<DisplayField id="FILE_COUNT" header="file_count" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:resourceCatalog/file_count"/>
-	</DisplayField>
-	<DisplayField id="FILE_SIZE" header="file_size" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:resourceCatalog/file_size"/>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:resourceCatalog.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:resourceCatalog.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="URI" default-sort-order="DESC" brief-description="ResourceCatalog" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="URI"/>
-		<DisplayFieldRef id="FORMAT"/>
-		<DisplayFieldRef id="DESCRIPTION"/>
-		<DisplayFieldRef id="CONTENT"/>
-		<DisplayFieldRef id="CACHEPATH"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="FILE_COUNT"/>
-		<DisplayFieldRef id="FILE_SIZE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="URI" default-sort-order="DESC" brief-description="ResourceCatalog" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="URI"/>
-		<DisplayFieldRef id="FORMAT"/>
-		<DisplayFieldRef id="DESCRIPTION"/>
-		<DisplayFieldRef id="CONTENT"/>
-		<DisplayFieldRef id="CACHEPATH"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="FILE_COUNT"/>
-		<DisplayFieldRef id="FILE_SIZE"/>
-	</DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_rfScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_rfScanData_display.xml
deleted file mode 100644
index c41504ab..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_rfScanData_display.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:rfScanData" full-description="RFScan" brief-description="RFScan">
-	<DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:rfScanData/image_session_ID"/>
-	</DisplayField>
-	<DisplayField id="NOTE" header="note" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:rfScanData/note"/>
-	</DisplayField>
-	<DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:rfScanData/quality"/>
-	</DisplayField>
-	<DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:rfScanData/condition"/>
-	</DisplayField>
-	<DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:rfScanData/series_description"/>
-	</DisplayField>
-	<DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:rfScanData/documentation"/>
-	</DisplayField>
-	<DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:rfScanData/scanner"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:rfScanData/scanner/manufacturer"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:rfScanData/scanner/model"/>
-	</DisplayField>
-	<DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:rfScanData/modality"/>
-	</DisplayField>
-	<DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:rfScanData/frames"/>
-	</DisplayField>
-	<DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:rfScanData/operator"/>
-	</DisplayField>
-	<DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:rfScanData/startTime"/>
-	</DisplayField>
-	<DisplayField id="ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:rfScanData/ID"/>
-	</DisplayField>
-	<DisplayField id="TYPE" header="type" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:rfScanData/type"/>
-	</DisplayField>
-	<DisplayField id="UID" header="UID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:rfScanData/UID"/>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="project" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:rfScanData/project"/>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:rfScanData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:rfScanData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="RFScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="RFScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-	</DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_rfSessionData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_rfSessionData_display.xml
deleted file mode 100644
index 45143249..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_rfSessionData_display.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:rfSessionData" full-description="RFSession" brief-description="RFSession">
-	<Arc name="PARTICIPANT_EXPERIMENT">
-		<CommonField id="PART_ID" local-field="SUBJECT_ID"/>
-		<CommonField id="DATE" local-field="DATE"/>
-		<CommonField id="EXPT_ID" local-field="EXPT_ID"/>
-	</Arc>
-	<DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:rfSessionData.subject_ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
-				<InsertValue id="Field1" field="SUBJECT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:rfSessionData.ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:rfSessionData','xnat:rfSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="RPT" header="ID" visible="true" image="true">
-		<Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:rfSessionData','xnat:rfSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="DATE" header="Date" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:rfSessionData.date"/>
-	</DisplayField>
-	<DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
-	<DisplayFieldElement name="Field1" schema-element="xnat:rfSessionData.date"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
-	<DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
-	<Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
-	</DisplayField>
-	<DisplayField header="Projects" id="PROJECTS" data-type="string">
-		<DisplayFieldElement name="Field1" viewName="XNAT_RFSESSIONDATA_PROJECTS" viewColumn="PROJECTS"/>
-	</DisplayField>
-	<DisplayField header="Label" id="LABEL" data-type="string">
-	<DisplayFieldElement name="Field1" schema-element="xnat:rfSessionData.ID"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:rfSessionData.label"/>
-	<Content type="sql">COALESCE(@Field2, @Field1)</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:rfSessionData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:rfSessionData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:rfSessionData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:rfSessionData/search_field/xnat:rfSessionData.ID">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:rfSessionData','xnat:rfSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="TITLE" value="Inserted: @Field1 (@Field2)">
-				<InsertValue id="Field1" field="INSERT_DATE"/>
-				<InsertValue id="Field2" field="INSERT_USER"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:rfSessionData.project"/>
-	</DisplayField>
-	<DisplayField id="XNAT_RFSESSIONDATA_PROJECT_IDENTIFIER" header="XNAT_RFSESSIONDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">xnat_rfsessiondata_project_id</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:rfSessionData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:rfSessionData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:rfSessionData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:rfSessionData/search_field/xnat:rfSessionData.ID/project/@Field2">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-				<InsertValue id="Field2" field="@WHERE"/>
-			</Property>
-		</HTML-Link>
-		<SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_rfsessiondata_project_id,sharing_share_xnat_experimentda_id FROM (	SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE'	UNION 	SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:rfSessionData.ID" queryField="sharing_share_xnat_experimentda_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:rfSessionData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:rfSessionData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayField id="XNAT_RFSESSIONDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">field</Content>
-		<SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:rfSessionData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:rfSessionData.ID" queryField="expt_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="RFSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="RPT"/>
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="RFSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="RFSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="EXPT_ID"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="RFSession" dark-color="9999CC" light-color="CCCCFF">
-	</DisplayVersion>
-	<DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="RFSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="XNAT_RFSESSIONDATA_PROJECT_IDENTIFIER"/>
-		<DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<ViewLink alias="XNAT_RFSESSIONDATA_PROJECTS">
-		<Mapping TableName="XNAT_RFSESSIONDATA_PROJECTS">
-			<MappingColumn rootElement="xnat:rfSessionData" fieldElement="xnat:rfSessionData.ID" mapsTo="id"/>
-		</Mapping>
-	</ViewLink>
-	<SQLView name="XNAT_RFSESSIONDATA_PROJECTS" sql="SELECT id, '&lt;' || expt.project || '&gt;' || xs_a_concat(',&lt;' || shared.project || '&gt;') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:rfSessionData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_rtImageScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_rtImageScanData_display.xml
deleted file mode 100644
index 7a4de14b..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_rtImageScanData_display.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:rtImageScanData" full-description="RTImageScan" brief-description="RTImageScan">
-	<DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:rtImageScanData/image_session_ID"/>
-	</DisplayField>
-	<DisplayField id="NOTE" header="note" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:rtImageScanData/note"/>
-	</DisplayField>
-	<DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:rtImageScanData/quality"/>
-	</DisplayField>
-	<DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:rtImageScanData/condition"/>
-	</DisplayField>
-	<DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:rtImageScanData/series_description"/>
-	</DisplayField>
-	<DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:rtImageScanData/documentation"/>
-	</DisplayField>
-	<DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:rtImageScanData/scanner"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:rtImageScanData/scanner/manufacturer"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:rtImageScanData/scanner/model"/>
-	</DisplayField>
-	<DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:rtImageScanData/modality"/>
-	</DisplayField>
-	<DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:rtImageScanData/frames"/>
-	</DisplayField>
-	<DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:rtImageScanData/operator"/>
-	</DisplayField>
-	<DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:rtImageScanData/startTime"/>
-	</DisplayField>
-	<DisplayField id="ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:rtImageScanData/ID"/>
-	</DisplayField>
-	<DisplayField id="TYPE" header="type" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:rtImageScanData/type"/>
-	</DisplayField>
-	<DisplayField id="UID" header="UID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:rtImageScanData/UID"/>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="project" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:rtImageScanData/project"/>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:rtImageScanData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:rtImageScanData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="RTImageScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="RTImageScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-	</DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_rtSessionData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_rtSessionData_display.xml
deleted file mode 100644
index 4c36043a..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_rtSessionData_display.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:rtSessionData" full-description="RTSession" brief-description="RTSession">
-	<Arc name="PARTICIPANT_EXPERIMENT">
-		<CommonField id="PART_ID" local-field="SUBJECT_ID"/>
-		<CommonField id="DATE" local-field="DATE"/>
-		<CommonField id="EXPT_ID" local-field="EXPT_ID"/>
-	</Arc>
-	<DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:rtSessionData.subject_ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
-				<InsertValue id="Field1" field="SUBJECT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:rtSessionData.ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:rtSessionData','xnat:rtSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="RPT" header="ID" visible="true" image="true">
-		<Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:rtSessionData','xnat:rtSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="DATE" header="Date" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:rtSessionData.date"/>
-	</DisplayField>
-	<DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
-	<DisplayFieldElement name="Field1" schema-element="xnat:rtSessionData.date"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
-	<DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
-	<Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
-	</DisplayField>
-	<DisplayField header="Projects" id="PROJECTS" data-type="string">
-		<DisplayFieldElement name="Field1" viewName="XNAT_RTSESSIONDATA_PROJECTS" viewColumn="PROJECTS"/>
-	</DisplayField>
-	<DisplayField header="Label" id="LABEL" data-type="string">
-	<DisplayFieldElement name="Field1" schema-element="xnat:rtSessionData.ID"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:rtSessionData.label"/>
-	<Content type="sql">COALESCE(@Field2, @Field1)</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:rtSessionData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:rtSessionData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:rtSessionData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:rtSessionData/search_field/xnat:rtSessionData.ID">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:rtSessionData','xnat:rtSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="TITLE" value="Inserted: @Field1 (@Field2)">
-				<InsertValue id="Field1" field="INSERT_DATE"/>
-				<InsertValue id="Field2" field="INSERT_USER"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:rtSessionData.project"/>
-	</DisplayField>
-	<DisplayField id="XNAT_RTSESSIONDATA_PROJECT_IDENTIFIER" header="XNAT_RTSESSIONDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">xnat_rtsessiondata_project_id</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:rtSessionData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:rtSessionData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:rtSessionData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:rtSessionData/search_field/xnat:rtSessionData.ID/project/@Field2">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-				<InsertValue id="Field2" field="@WHERE"/>
-			</Property>
-		</HTML-Link>
-		<SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_rtsessiondata_project_id,sharing_share_xnat_experimentda_id FROM (	SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE'	UNION 	SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:rtSessionData.ID" queryField="sharing_share_xnat_experimentda_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:rtSessionData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:rtSessionData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayField id="XNAT_RTSESSIONDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">field</Content>
-		<SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:rtSessionData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:rtSessionData.ID" queryField="expt_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="RTSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="RPT"/>
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="RTSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="RTSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="EXPT_ID"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="RTSession" dark-color="9999CC" light-color="CCCCFF">
-	</DisplayVersion>
-	<DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="RTSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="XNAT_RTSESSIONDATA_PROJECT_IDENTIFIER"/>
-		<DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<ViewLink alias="XNAT_RTSESSIONDATA_PROJECTS">
-		<Mapping TableName="XNAT_RTSESSIONDATA_PROJECTS">
-			<MappingColumn rootElement="xnat:rtSessionData" fieldElement="xnat:rtSessionData.ID" mapsTo="id"/>
-		</Mapping>
-	</ViewLink>
-	<SQLView name="XNAT_RTSESSIONDATA_PROJECTS" sql="SELECT id, '&lt;' || expt.project || '&gt;' || xs_a_concat(',&lt;' || shared.project || '&gt;') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:rtSessionData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_scScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_scScanData_display.xml
deleted file mode 100644
index 3860e29a..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_scScanData_display.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:scScanData" full-description="SCScan" brief-description="SCScan">
-	<DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:scScanData/image_session_ID"/>
-	</DisplayField>
-	<DisplayField id="NOTE" header="note" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:scScanData/note"/>
-	</DisplayField>
-	<DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:scScanData/quality"/>
-	</DisplayField>
-	<DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:scScanData/condition"/>
-	</DisplayField>
-	<DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:scScanData/series_description"/>
-	</DisplayField>
-	<DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:scScanData/documentation"/>
-	</DisplayField>
-	<DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:scScanData/scanner"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:scScanData/scanner/manufacturer"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:scScanData/scanner/model"/>
-	</DisplayField>
-	<DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:scScanData/modality"/>
-	</DisplayField>
-	<DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:scScanData/frames"/>
-	</DisplayField>
-	<DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:scScanData/operator"/>
-	</DisplayField>
-	<DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:scScanData/startTime"/>
-	</DisplayField>
-	<DisplayField id="ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:scScanData/ID"/>
-	</DisplayField>
-	<DisplayField id="TYPE" header="type" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:scScanData/type"/>
-	</DisplayField>
-	<DisplayField id="UID" header="UID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:scScanData/UID"/>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="project" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:scScanData/project"/>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:scScanData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:scScanData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="SCScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="SCScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-	</DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_segScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_segScanData_display.xml
deleted file mode 100644
index 29ea28c9..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_segScanData_display.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:segScanData" full-description="SegScan" brief-description="SegScan">
-	<DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:segScanData/image_session_ID"/>
-	</DisplayField>
-	<DisplayField id="NOTE" header="note" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:segScanData/note"/>
-	</DisplayField>
-	<DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:segScanData/quality"/>
-	</DisplayField>
-	<DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:segScanData/condition"/>
-	</DisplayField>
-	<DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:segScanData/series_description"/>
-	</DisplayField>
-	<DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:segScanData/documentation"/>
-	</DisplayField>
-	<DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:segScanData/scanner"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:segScanData/scanner/manufacturer"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:segScanData/scanner/model"/>
-	</DisplayField>
-	<DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:segScanData/modality"/>
-	</DisplayField>
-	<DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:segScanData/frames"/>
-	</DisplayField>
-	<DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:segScanData/operator"/>
-	</DisplayField>
-	<DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:segScanData/startTime"/>
-	</DisplayField>
-	<DisplayField id="ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:segScanData/ID"/>
-	</DisplayField>
-	<DisplayField id="TYPE" header="type" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:segScanData/type"/>
-	</DisplayField>
-	<DisplayField id="UID" header="UID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:segScanData/UID"/>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="project" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:segScanData/project"/>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:segScanData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:segScanData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="SegScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="SegScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-	</DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_smScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_smScanData_display.xml
deleted file mode 100644
index 417ff11e..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_smScanData_display.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:smScanData" full-description="SMScan" brief-description="SMScan">
-	<DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:smScanData/image_session_ID"/>
-	</DisplayField>
-	<DisplayField id="NOTE" header="note" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:smScanData/note"/>
-	</DisplayField>
-	<DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:smScanData/quality"/>
-	</DisplayField>
-	<DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:smScanData/condition"/>
-	</DisplayField>
-	<DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:smScanData/series_description"/>
-	</DisplayField>
-	<DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:smScanData/documentation"/>
-	</DisplayField>
-	<DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:smScanData/scanner"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:smScanData/scanner/manufacturer"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:smScanData/scanner/model"/>
-	</DisplayField>
-	<DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:smScanData/modality"/>
-	</DisplayField>
-	<DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:smScanData/frames"/>
-	</DisplayField>
-	<DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:smScanData/operator"/>
-	</DisplayField>
-	<DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:smScanData/startTime"/>
-	</DisplayField>
-	<DisplayField id="ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:smScanData/ID"/>
-	</DisplayField>
-	<DisplayField id="TYPE" header="type" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:smScanData/type"/>
-	</DisplayField>
-	<DisplayField id="UID" header="UID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:smScanData/UID"/>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="project" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:smScanData/project"/>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:smScanData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:smScanData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="SMScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="SMScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-	</DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_smSessionData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_smSessionData_display.xml
deleted file mode 100644
index e08c8e91..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_smSessionData_display.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:smSessionData" full-description="SMSession" brief-description="SMSession">
-	<Arc name="PARTICIPANT_EXPERIMENT">
-		<CommonField id="PART_ID" local-field="SUBJECT_ID"/>
-		<CommonField id="DATE" local-field="DATE"/>
-		<CommonField id="EXPT_ID" local-field="EXPT_ID"/>
-	</Arc>
-	<DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:smSessionData.subject_ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
-				<InsertValue id="Field1" field="SUBJECT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:smSessionData.ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:smSessionData','xnat:smSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="RPT" header="ID" visible="true" image="true">
-		<Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:smSessionData','xnat:smSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="DATE" header="Date" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:smSessionData.date"/>
-	</DisplayField>
-	<DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
-	<DisplayFieldElement name="Field1" schema-element="xnat:smSessionData.date"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
-	<DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
-	<Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
-	</DisplayField>
-	<DisplayField header="Projects" id="PROJECTS" data-type="string">
-		<DisplayFieldElement name="Field1" viewName="XNAT_SMSESSIONDATA_PROJECTS" viewColumn="PROJECTS"/>
-	</DisplayField>
-	<DisplayField header="Label" id="LABEL" data-type="string">
-	<DisplayFieldElement name="Field1" schema-element="xnat:smSessionData.ID"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:smSessionData.label"/>
-	<Content type="sql">COALESCE(@Field2, @Field1)</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:smSessionData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:smSessionData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:smSessionData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:smSessionData/search_field/xnat:smSessionData.ID">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:smSessionData','xnat:smSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="TITLE" value="Inserted: @Field1 (@Field2)">
-				<InsertValue id="Field1" field="INSERT_DATE"/>
-				<InsertValue id="Field2" field="INSERT_USER"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:smSessionData.project"/>
-	</DisplayField>
-	<DisplayField id="XNAT_SMSESSIONDATA_PROJECT_IDENTIFIER" header="XNAT_SMSESSIONDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">xnat_smsessiondata_project_id</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:smSessionData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:smSessionData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:smSessionData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:smSessionData/search_field/xnat:smSessionData.ID/project/@Field2">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-				<InsertValue id="Field2" field="@WHERE"/>
-			</Property>
-		</HTML-Link>
-		<SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_smsessiondata_project_id,sharing_share_xnat_experimentda_id FROM (	SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE'	UNION 	SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:smSessionData.ID" queryField="sharing_share_xnat_experimentda_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:smSessionData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:smSessionData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayField id="XNAT_SMSESSIONDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">field</Content>
-		<SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:smSessionData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:smSessionData.ID" queryField="expt_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="SMSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="RPT"/>
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="SMSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="SMSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="EXPT_ID"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="SMSession" dark-color="9999CC" light-color="CCCCFF">
-	</DisplayVersion>
-	<DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="SMSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="XNAT_SMSESSIONDATA_PROJECT_IDENTIFIER"/>
-		<DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<ViewLink alias="XNAT_SMSESSIONDATA_PROJECTS">
-		<Mapping TableName="XNAT_SMSESSIONDATA_PROJECTS">
-			<MappingColumn rootElement="xnat:smSessionData" fieldElement="xnat:smSessionData.ID" mapsTo="id"/>
-		</Mapping>
-	</ViewLink>
-	<SQLView name="XNAT_SMSESSIONDATA_PROJECTS" sql="SELECT id, '&lt;' || expt.project || '&gt;' || xs_a_concat(',&lt;' || shared.project || '&gt;') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:smSessionData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_srScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_srScanData_display.xml
deleted file mode 100644
index b49d1f2c..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_srScanData_display.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:srScanData" full-description="SRScan" brief-description="SRScan">
-	<DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:srScanData/image_session_ID"/>
-	</DisplayField>
-	<DisplayField id="NOTE" header="note" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:srScanData/note"/>
-	</DisplayField>
-	<DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:srScanData/quality"/>
-	</DisplayField>
-	<DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:srScanData/condition"/>
-	</DisplayField>
-	<DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:srScanData/series_description"/>
-	</DisplayField>
-	<DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:srScanData/documentation"/>
-	</DisplayField>
-	<DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:srScanData/scanner"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:srScanData/scanner/manufacturer"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:srScanData/scanner/model"/>
-	</DisplayField>
-	<DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:srScanData/modality"/>
-	</DisplayField>
-	<DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:srScanData/frames"/>
-	</DisplayField>
-	<DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:srScanData/operator"/>
-	</DisplayField>
-	<DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:srScanData/startTime"/>
-	</DisplayField>
-	<DisplayField id="ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:srScanData/ID"/>
-	</DisplayField>
-	<DisplayField id="TYPE" header="type" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:srScanData/type"/>
-	</DisplayField>
-	<DisplayField id="UID" header="UID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:srScanData/UID"/>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="project" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:srScanData/project"/>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:srScanData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:srScanData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="SRScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="SRScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-	</DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_srSessionData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_srSessionData_display.xml
deleted file mode 100644
index d6a93553..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_srSessionData_display.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:srSessionData" full-description="SRSession" brief-description="SRSession">
-	<Arc name="PARTICIPANT_EXPERIMENT">
-		<CommonField id="PART_ID" local-field="SUBJECT_ID"/>
-		<CommonField id="DATE" local-field="DATE"/>
-		<CommonField id="EXPT_ID" local-field="EXPT_ID"/>
-	</Arc>
-	<DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:srSessionData.subject_ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
-				<InsertValue id="Field1" field="SUBJECT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:srSessionData.ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:srSessionData','xnat:srSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="RPT" header="ID" visible="true" image="true">
-		<Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:srSessionData','xnat:srSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="DATE" header="Date" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:srSessionData.date"/>
-	</DisplayField>
-	<DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
-	<DisplayFieldElement name="Field1" schema-element="xnat:srSessionData.date"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
-	<DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
-	<Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
-	</DisplayField>
-	<DisplayField header="Projects" id="PROJECTS" data-type="string">
-		<DisplayFieldElement name="Field1" viewName="XNAT_SRSESSIONDATA_PROJECTS" viewColumn="PROJECTS"/>
-	</DisplayField>
-	<DisplayField header="Label" id="LABEL" data-type="string">
-	<DisplayFieldElement name="Field1" schema-element="xnat:srSessionData.ID"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:srSessionData.label"/>
-	<Content type="sql">COALESCE(@Field2, @Field1)</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:srSessionData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:srSessionData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:srSessionData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:srSessionData/search_field/xnat:srSessionData.ID">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:srSessionData','xnat:srSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="TITLE" value="Inserted: @Field1 (@Field2)">
-				<InsertValue id="Field1" field="INSERT_DATE"/>
-				<InsertValue id="Field2" field="INSERT_USER"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:srSessionData.project"/>
-	</DisplayField>
-	<DisplayField id="XNAT_SRSESSIONDATA_PROJECT_IDENTIFIER" header="XNAT_SRSESSIONDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">xnat_srsessiondata_project_id</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:srSessionData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:srSessionData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:srSessionData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:srSessionData/search_field/xnat:srSessionData.ID/project/@Field2">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-				<InsertValue id="Field2" field="@WHERE"/>
-			</Property>
-		</HTML-Link>
-		<SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_srsessiondata_project_id,sharing_share_xnat_experimentda_id FROM (	SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE'	UNION 	SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:srSessionData.ID" queryField="sharing_share_xnat_experimentda_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:srSessionData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:srSessionData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayField id="XNAT_SRSESSIONDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">field</Content>
-		<SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:srSessionData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:srSessionData.ID" queryField="expt_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="SRSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="RPT"/>
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="SRSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="SRSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="EXPT_ID"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="SRSession" dark-color="9999CC" light-color="CCCCFF">
-	</DisplayVersion>
-	<DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="SRSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="XNAT_SRSESSIONDATA_PROJECT_IDENTIFIER"/>
-		<DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<ViewLink alias="XNAT_SRSESSIONDATA_PROJECTS">
-		<Mapping TableName="XNAT_SRSESSIONDATA_PROJECTS">
-			<MappingColumn rootElement="xnat:srSessionData" fieldElement="xnat:srSessionData.ID" mapsTo="id"/>
-		</Mapping>
-	</ViewLink>
-	<SQLView name="XNAT_SRSESSIONDATA_PROJECTS" sql="SELECT id, '&lt;' || expt.project || '&gt;' || xs_a_concat(',&lt;' || shared.project || '&gt;') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:srSessionData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_subjectVariablesData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_subjectVariablesData_display.xml
deleted file mode 100644
index abd65f0b..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_subjectVariablesData_display.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:subjectVariablesData" full-description="SubjectVariables" brief-description="SubjectVariables">
-	<Arc name="PARTICIPANT_EXPERIMENT">
-		<CommonField id="PART_ID" local-field="SUBJECT_ID"/>
-		<CommonField id="DATE" local-field="DATE"/>
-		<CommonField id="EXPT_ID" local-field="EXPT_ID"/>
-	</Arc>
-	<DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:subjectVariablesData.subject_ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
-				<InsertValue id="Field1" field="SUBJECT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:subjectVariablesData.ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectVariablesData','xnat:subjectVariablesData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="RPT" header="ID" visible="true" image="true">
-		<Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectVariablesData','xnat:subjectVariablesData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="DATE" header="Date" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:subjectVariablesData.date"/>
-	</DisplayField>
-	<DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
-	<DisplayFieldElement name="Field1" schema-element="xnat:subjectVariablesData.date"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
-	<DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
-	<Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
-	</DisplayField>
-	<DisplayField header="Projects" id="PROJECTS" data-type="string">
-		<DisplayFieldElement name="Field1" viewName="XNAT_SUBJECTVARIABLESDATA_PROJECTS" viewColumn="PROJECTS"/>
-	</DisplayField>
-	<DisplayField header="Label" id="LABEL" data-type="string">
-	<DisplayFieldElement name="Field1" schema-element="xnat:subjectVariablesData.ID"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:subjectVariablesData.label"/>
-	<Content type="sql">COALESCE(@Field2, @Field1)</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:subjectVariablesData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:subjectVariablesData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:subjectVariablesData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:subjectVariablesData/search_field/xnat:subjectVariablesData.ID">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectVariablesData','xnat:subjectVariablesData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="TITLE" value="Inserted: @Field1 (@Field2)">
-				<InsertValue id="Field1" field="INSERT_DATE"/>
-				<InsertValue id="Field2" field="INSERT_USER"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:subjectVariablesData.project"/>
-	</DisplayField>
-	<DisplayField id="XNAT_SUBJECTVARIABLESDATA_PROJECT_IDENTIFIER" header="XNAT_SUBJECTVARIABLESDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">xnat_subjectvariablesdata_project_id</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:subjectVariablesData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:subjectVariablesData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:subjectVariablesData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:subjectVariablesData/search_field/xnat:subjectVariablesData.ID/project/@Field2">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-				<InsertValue id="Field2" field="@WHERE"/>
-			</Property>
-		</HTML-Link>
-		<SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_subjectvariablesdata_project_id,sharing_share_xnat_experimentda_id FROM (	SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE'	UNION 	SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:subjectVariablesData.ID" queryField="sharing_share_xnat_experimentda_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:subjectVariablesData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:subjectVariablesData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayField id="XNAT_SUBJECTVARIABLESDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">field</Content>
-		<SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:subjectVariablesData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:subjectVariablesData.ID" queryField="expt_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="SubjectVariables" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="RPT"/>
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="SubjectVariables" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="SubjectVariables" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="EXPT_ID"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="SubjectVariables" dark-color="9999CC" light-color="CCCCFF">
-	</DisplayVersion>
-	<DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="SubjectVariables" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="XNAT_SUBJECTVARIABLESDATA_PROJECT_IDENTIFIER"/>
-		<DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<ViewLink alias="XNAT_SUBJECTVARIABLESDATA_PROJECTS">
-		<Mapping TableName="XNAT_SUBJECTVARIABLESDATA_PROJECTS">
-			<MappingColumn rootElement="xnat:subjectVariablesData" fieldElement="xnat:subjectVariablesData.ID" mapsTo="id"/>
-		</Mapping>
-	</ViewLink>
-	<SQLView name="XNAT_SUBJECTVARIABLESDATA_PROJECTS" sql="SELECT id, '&lt;' || expt.project || '&gt;' || xs_a_concat(',&lt;' || shared.project || '&gt;') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:subjectVariablesData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_usScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_usScanData_display.xml
deleted file mode 100644
index 807f3498..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_usScanData_display.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:usScanData" full-description="USScan" brief-description="USScan">
-	<DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:usScanData/image_session_ID"/>
-	</DisplayField>
-	<DisplayField id="NOTE" header="note" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:usScanData/note"/>
-	</DisplayField>
-	<DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:usScanData/quality"/>
-	</DisplayField>
-	<DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:usScanData/condition"/>
-	</DisplayField>
-	<DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:usScanData/series_description"/>
-	</DisplayField>
-	<DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:usScanData/documentation"/>
-	</DisplayField>
-	<DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:usScanData/scanner"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:usScanData/scanner/manufacturer"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:usScanData/scanner/model"/>
-	</DisplayField>
-	<DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:usScanData/modality"/>
-	</DisplayField>
-	<DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:usScanData/frames"/>
-	</DisplayField>
-	<DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:usScanData/operator"/>
-	</DisplayField>
-	<DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:usScanData/startTime"/>
-	</DisplayField>
-	<DisplayField id="ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:usScanData/ID"/>
-	</DisplayField>
-	<DisplayField id="TYPE" header="type" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:usScanData/type"/>
-	</DisplayField>
-	<DisplayField id="UID" header="UID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:usScanData/UID"/>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="project" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:usScanData/project"/>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:usScanData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:usScanData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="USScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="USScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-	</DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_usSessionData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_usSessionData_display.xml
deleted file mode 100644
index 0da85690..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_usSessionData_display.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:usSessionData" full-description="USSession" brief-description="USSession">
-	<Arc name="PARTICIPANT_EXPERIMENT">
-		<CommonField id="PART_ID" local-field="SUBJECT_ID"/>
-		<CommonField id="DATE" local-field="DATE"/>
-		<CommonField id="EXPT_ID" local-field="EXPT_ID"/>
-	</Arc>
-	<DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:usSessionData.subject_ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
-				<InsertValue id="Field1" field="SUBJECT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:usSessionData.ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:usSessionData','xnat:usSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="RPT" header="ID" visible="true" image="true">
-		<Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:usSessionData','xnat:usSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="DATE" header="Date" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:usSessionData.date"/>
-	</DisplayField>
-	<DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
-	<DisplayFieldElement name="Field1" schema-element="xnat:usSessionData.date"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
-	<DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
-	<Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
-	</DisplayField>
-	<DisplayField header="Projects" id="PROJECTS" data-type="string">
-		<DisplayFieldElement name="Field1" viewName="XNAT_USSESSIONDATA_PROJECTS" viewColumn="PROJECTS"/>
-	</DisplayField>
-	<DisplayField header="Label" id="LABEL" data-type="string">
-	<DisplayFieldElement name="Field1" schema-element="xnat:usSessionData.ID"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:usSessionData.label"/>
-	<Content type="sql">COALESCE(@Field2, @Field1)</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:usSessionData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:usSessionData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:usSessionData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:usSessionData/search_field/xnat:usSessionData.ID">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:usSessionData','xnat:usSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="TITLE" value="Inserted: @Field1 (@Field2)">
-				<InsertValue id="Field1" field="INSERT_DATE"/>
-				<InsertValue id="Field2" field="INSERT_USER"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:usSessionData.project"/>
-	</DisplayField>
-	<DisplayField id="XNAT_USSESSIONDATA_PROJECT_IDENTIFIER" header="XNAT_USSESSIONDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">xnat_ussessiondata_project_id</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:usSessionData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:usSessionData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:usSessionData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:usSessionData/search_field/xnat:usSessionData.ID/project/@Field2">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-				<InsertValue id="Field2" field="@WHERE"/>
-			</Property>
-		</HTML-Link>
-		<SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_ussessiondata_project_id,sharing_share_xnat_experimentda_id FROM (	SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE'	UNION 	SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:usSessionData.ID" queryField="sharing_share_xnat_experimentda_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:usSessionData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:usSessionData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayField id="XNAT_USSESSIONDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">field</Content>
-		<SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:usSessionData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:usSessionData.ID" queryField="expt_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="USSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="RPT"/>
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="USSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="USSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="EXPT_ID"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="USSession" dark-color="9999CC" light-color="CCCCFF">
-	</DisplayVersion>
-	<DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="USSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="XNAT_USSESSIONDATA_PROJECT_IDENTIFIER"/>
-		<DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<ViewLink alias="XNAT_USSESSIONDATA_PROJECTS">
-		<Mapping TableName="XNAT_USSESSIONDATA_PROJECTS">
-			<MappingColumn rootElement="xnat:usSessionData" fieldElement="xnat:usSessionData.ID" mapsTo="id"/>
-		</Mapping>
-	</ViewLink>
-	<SQLView name="XNAT_USSESSIONDATA_PROJECTS" sql="SELECT id, '&lt;' || expt.project || '&gt;' || xs_a_concat(',&lt;' || shared.project || '&gt;') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:usSessionData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_voiceAudioScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_voiceAudioScanData_display.xml
deleted file mode 100644
index 6be1cb7b..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_voiceAudioScanData_display.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:voiceAudioScanData" full-description="VoiceAudioScan" brief-description="VoiceAudioScan">
-	<DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:voiceAudioScanData/image_session_ID"/>
-	</DisplayField>
-	<DisplayField id="NOTE" header="note" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:voiceAudioScanData/note"/>
-	</DisplayField>
-	<DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:voiceAudioScanData/quality"/>
-	</DisplayField>
-	<DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:voiceAudioScanData/condition"/>
-	</DisplayField>
-	<DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:voiceAudioScanData/series_description"/>
-	</DisplayField>
-	<DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:voiceAudioScanData/documentation"/>
-	</DisplayField>
-	<DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:voiceAudioScanData/scanner"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:voiceAudioScanData/scanner/manufacturer"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:voiceAudioScanData/scanner/model"/>
-	</DisplayField>
-	<DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:voiceAudioScanData/modality"/>
-	</DisplayField>
-	<DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:voiceAudioScanData/frames"/>
-	</DisplayField>
-	<DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:voiceAudioScanData/operator"/>
-	</DisplayField>
-	<DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:voiceAudioScanData/startTime"/>
-	</DisplayField>
-	<DisplayField id="ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:voiceAudioScanData/ID"/>
-	</DisplayField>
-	<DisplayField id="TYPE" header="type" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:voiceAudioScanData/type"/>
-	</DisplayField>
-	<DisplayField id="UID" header="UID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:voiceAudioScanData/UID"/>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="project" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:voiceAudioScanData/project"/>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:voiceAudioScanData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:voiceAudioScanData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="VoiceAudioScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="VoiceAudioScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-	</DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_xa3DScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_xa3DScanData_display.xml
deleted file mode 100644
index 4b48e129..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_xa3DScanData_display.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:xa3DScanData" full-description="XA3DScan" brief-description="XA3DScan">
-	<DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xa3DScanData/image_session_ID"/>
-	</DisplayField>
-	<DisplayField id="NOTE" header="note" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xa3DScanData/note"/>
-	</DisplayField>
-	<DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xa3DScanData/quality"/>
-	</DisplayField>
-	<DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xa3DScanData/condition"/>
-	</DisplayField>
-	<DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xa3DScanData/series_description"/>
-	</DisplayField>
-	<DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xa3DScanData/documentation"/>
-	</DisplayField>
-	<DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xa3DScanData/scanner"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xa3DScanData/scanner/manufacturer"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xa3DScanData/scanner/model"/>
-	</DisplayField>
-	<DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xa3DScanData/modality"/>
-	</DisplayField>
-	<DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xa3DScanData/frames"/>
-	</DisplayField>
-	<DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xa3DScanData/operator"/>
-	</DisplayField>
-	<DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xa3DScanData/startTime"/>
-	</DisplayField>
-	<DisplayField id="ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xa3DScanData/ID"/>
-	</DisplayField>
-	<DisplayField id="TYPE" header="type" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xa3DScanData/type"/>
-	</DisplayField>
-	<DisplayField id="UID" header="UID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xa3DScanData/UID"/>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="project" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xa3DScanData/project"/>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xa3DScanData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xa3DScanData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="XA3DScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="XA3DScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-	</DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_xa3DSessionData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_xa3DSessionData_display.xml
deleted file mode 100644
index 8a3812c3..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_xa3DSessionData_display.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:xa3DSessionData" full-description="XA3DSession" brief-description="XA3DSession">
-	<Arc name="PARTICIPANT_EXPERIMENT">
-		<CommonField id="PART_ID" local-field="SUBJECT_ID"/>
-		<CommonField id="DATE" local-field="DATE"/>
-		<CommonField id="EXPT_ID" local-field="EXPT_ID"/>
-	</Arc>
-	<DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xa3DSessionData.subject_ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
-				<InsertValue id="Field1" field="SUBJECT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xa3DSessionData.ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:xa3DSessionData','xnat:xa3DSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="RPT" header="ID" visible="true" image="true">
-		<Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:xa3DSessionData','xnat:xa3DSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="DATE" header="Date" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xa3DSessionData.date"/>
-	</DisplayField>
-	<DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
-	<DisplayFieldElement name="Field1" schema-element="xnat:xa3DSessionData.date"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
-	<DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
-	<Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
-	</DisplayField>
-	<DisplayField header="Projects" id="PROJECTS" data-type="string">
-		<DisplayFieldElement name="Field1" viewName="XNAT_XA3DSESSIONDATA_PROJECTS" viewColumn="PROJECTS"/>
-	</DisplayField>
-	<DisplayField header="Label" id="LABEL" data-type="string">
-	<DisplayFieldElement name="Field1" schema-element="xnat:xa3DSessionData.ID"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:xa3DSessionData.label"/>
-	<Content type="sql">COALESCE(@Field2, @Field1)</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:xa3DSessionData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:xa3DSessionData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:xa3DSessionData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:xa3DSessionData/search_field/xnat:xa3DSessionData.ID">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:xa3DSessionData','xnat:xa3DSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="TITLE" value="Inserted: @Field1 (@Field2)">
-				<InsertValue id="Field1" field="INSERT_DATE"/>
-				<InsertValue id="Field2" field="INSERT_USER"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xa3DSessionData.project"/>
-	</DisplayField>
-	<DisplayField id="XNAT_XA3DSESSIONDATA_PROJECT_IDENTIFIER" header="XNAT_XA3DSESSIONDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">xnat_xa3dsessiondata_project_id</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:xa3DSessionData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:xa3DSessionData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:xa3DSessionData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:xa3DSessionData/search_field/xnat:xa3DSessionData.ID/project/@Field2">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-				<InsertValue id="Field2" field="@WHERE"/>
-			</Property>
-		</HTML-Link>
-		<SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_xa3dsessiondata_project_id,sharing_share_xnat_experimentda_id FROM (	SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE'	UNION 	SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:xa3DSessionData.ID" queryField="sharing_share_xnat_experimentda_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xa3DSessionData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xa3DSessionData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayField id="XNAT_XA3DSESSIONDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">field</Content>
-		<SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:xa3DSessionData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:xa3DSessionData.ID" queryField="expt_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="XA3DSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="RPT"/>
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="XA3DSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="XA3DSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="EXPT_ID"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="XA3DSession" dark-color="9999CC" light-color="CCCCFF">
-	</DisplayVersion>
-	<DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="XA3DSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="XNAT_XA3DSESSIONDATA_PROJECT_IDENTIFIER"/>
-		<DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<ViewLink alias="XNAT_XA3DSESSIONDATA_PROJECTS">
-		<Mapping TableName="XNAT_XA3DSESSIONDATA_PROJECTS">
-			<MappingColumn rootElement="xnat:xa3DSessionData" fieldElement="xnat:xa3DSessionData.ID" mapsTo="id"/>
-		</Mapping>
-	</ViewLink>
-	<SQLView name="XNAT_XA3DSESSIONDATA_PROJECTS" sql="SELECT id, '&lt;' || expt.project || '&gt;' || xs_a_concat(',&lt;' || shared.project || '&gt;') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:xa3DSessionData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_xaScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_xaScanData_display.xml
deleted file mode 100644
index e8e0e744..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_xaScanData_display.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:xaScanData" full-description="XAScan" brief-description="XAScan">
-	<DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xaScanData/image_session_ID"/>
-	</DisplayField>
-	<DisplayField id="NOTE" header="note" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xaScanData/note"/>
-	</DisplayField>
-	<DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xaScanData/quality"/>
-	</DisplayField>
-	<DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xaScanData/condition"/>
-	</DisplayField>
-	<DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xaScanData/series_description"/>
-	</DisplayField>
-	<DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xaScanData/documentation"/>
-	</DisplayField>
-	<DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xaScanData/scanner"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xaScanData/scanner/manufacturer"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xaScanData/scanner/model"/>
-	</DisplayField>
-	<DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xaScanData/modality"/>
-	</DisplayField>
-	<DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xaScanData/frames"/>
-	</DisplayField>
-	<DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xaScanData/operator"/>
-	</DisplayField>
-	<DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xaScanData/startTime"/>
-	</DisplayField>
-	<DisplayField id="ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xaScanData/ID"/>
-	</DisplayField>
-	<DisplayField id="TYPE" header="type" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xaScanData/type"/>
-	</DisplayField>
-	<DisplayField id="UID" header="UID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xaScanData/UID"/>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="project" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xaScanData/project"/>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xaScanData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xaScanData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_PIXELRES_UNITS" header="units" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xaScanData/parameters/pixelRes/units"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_PIXELRES_X" header="x" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xaScanData/parameters/pixelRes/x"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_PIXELRES_Y" header="y" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xaScanData/parameters/pixelRes/y"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_ORIENTATION" header="orientation" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xaScanData/parameters/orientation"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_FOV_X" header="x" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xaScanData/parameters/fov/x"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_FOV_Y" header="y" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xaScanData/parameters/fov/y"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_IMAGETYPE" header="imageType" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xaScanData/parameters/imageType"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_OPTIONS" header="options" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xaScanData/parameters/options"/>
-	</DisplayField>
-	<DisplayField id="PARAMETERS_DERIVATION" header="derivation" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xaScanData/parameters/derivation"/>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="XAScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-		<DisplayFieldRef id="PARAMETERS_PIXELRES_UNITS"/>
-		<DisplayFieldRef id="PARAMETERS_PIXELRES_X"/>
-		<DisplayFieldRef id="PARAMETERS_PIXELRES_Y"/>
-		<DisplayFieldRef id="PARAMETERS_ORIENTATION"/>
-		<DisplayFieldRef id="PARAMETERS_FOV_X"/>
-		<DisplayFieldRef id="PARAMETERS_FOV_Y"/>
-		<DisplayFieldRef id="PARAMETERS_IMAGETYPE"/>
-		<DisplayFieldRef id="PARAMETERS_OPTIONS"/>
-		<DisplayFieldRef id="PARAMETERS_DERIVATION"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="XAScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-		<DisplayFieldRef id="PARAMETERS_PIXELRES_UNITS"/>
-		<DisplayFieldRef id="PARAMETERS_PIXELRES_X"/>
-		<DisplayFieldRef id="PARAMETERS_PIXELRES_Y"/>
-		<DisplayFieldRef id="PARAMETERS_ORIENTATION"/>
-		<DisplayFieldRef id="PARAMETERS_FOV_X"/>
-		<DisplayFieldRef id="PARAMETERS_FOV_Y"/>
-		<DisplayFieldRef id="PARAMETERS_IMAGETYPE"/>
-		<DisplayFieldRef id="PARAMETERS_OPTIONS"/>
-		<DisplayFieldRef id="PARAMETERS_DERIVATION"/>
-	</DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_xaSessionData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_xaSessionData_display.xml
deleted file mode 100644
index 5b58c422..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_xaSessionData_display.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:xaSessionData" full-description="XASession" brief-description="XASession">
-	<Arc name="PARTICIPANT_EXPERIMENT">
-		<CommonField id="PART_ID" local-field="SUBJECT_ID"/>
-		<CommonField id="DATE" local-field="DATE"/>
-		<CommonField id="EXPT_ID" local-field="EXPT_ID"/>
-	</Arc>
-	<DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xaSessionData.subject_ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
-				<InsertValue id="Field1" field="SUBJECT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xaSessionData.ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:xaSessionData','xnat:xaSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="RPT" header="ID" visible="true" image="true">
-		<Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:xaSessionData','xnat:xaSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="DATE" header="Date" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xaSessionData.date"/>
-	</DisplayField>
-	<DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
-	<DisplayFieldElement name="Field1" schema-element="xnat:xaSessionData.date"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
-	<DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
-	<Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
-	</DisplayField>
-	<DisplayField header="Projects" id="PROJECTS" data-type="string">
-		<DisplayFieldElement name="Field1" viewName="XNAT_XASESSIONDATA_PROJECTS" viewColumn="PROJECTS"/>
-	</DisplayField>
-	<DisplayField header="Label" id="LABEL" data-type="string">
-	<DisplayFieldElement name="Field1" schema-element="xnat:xaSessionData.ID"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:xaSessionData.label"/>
-	<Content type="sql">COALESCE(@Field2, @Field1)</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:xaSessionData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:xaSessionData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:xaSessionData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:xaSessionData/search_field/xnat:xaSessionData.ID">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:xaSessionData','xnat:xaSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="TITLE" value="Inserted: @Field1 (@Field2)">
-				<InsertValue id="Field1" field="INSERT_DATE"/>
-				<InsertValue id="Field2" field="INSERT_USER"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xaSessionData.project"/>
-	</DisplayField>
-	<DisplayField id="XNAT_XASESSIONDATA_PROJECT_IDENTIFIER" header="XNAT_XASESSIONDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">xnat_xasessiondata_project_id</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:xaSessionData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:xaSessionData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:xaSessionData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:xaSessionData/search_field/xnat:xaSessionData.ID/project/@Field2">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-				<InsertValue id="Field2" field="@WHERE"/>
-			</Property>
-		</HTML-Link>
-		<SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_xasessiondata_project_id,sharing_share_xnat_experimentda_id FROM (	SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE'	UNION 	SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:xaSessionData.ID" queryField="sharing_share_xnat_experimentda_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xaSessionData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xaSessionData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayField id="XNAT_XASESSIONDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">field</Content>
-		<SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:xaSessionData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:xaSessionData.ID" queryField="expt_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="XASession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="RPT"/>
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="XASession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="XASession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="EXPT_ID"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="XASession" dark-color="9999CC" light-color="CCCCFF">
-	</DisplayVersion>
-	<DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="XASession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="XNAT_XASESSIONDATA_PROJECT_IDENTIFIER"/>
-		<DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<ViewLink alias="XNAT_XASESSIONDATA_PROJECTS">
-		<Mapping TableName="XNAT_XASESSIONDATA_PROJECTS">
-			<MappingColumn rootElement="xnat:xaSessionData" fieldElement="xnat:xaSessionData.ID" mapsTo="id"/>
-		</Mapping>
-	</ViewLink>
-	<SQLView name="XNAT_XASESSIONDATA_PROJECTS" sql="SELECT id, '&lt;' || expt.project || '&gt;' || xs_a_concat(',&lt;' || shared.project || '&gt;') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:xaSessionData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_xcScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_xcScanData_display.xml
deleted file mode 100644
index 380092c1..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_xcScanData_display.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:xcScanData" full-description="XCScan" brief-description="XCScan">
-	<DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xcScanData/image_session_ID"/>
-	</DisplayField>
-	<DisplayField id="NOTE" header="note" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xcScanData/note"/>
-	</DisplayField>
-	<DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xcScanData/quality"/>
-	</DisplayField>
-	<DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xcScanData/condition"/>
-	</DisplayField>
-	<DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xcScanData/series_description"/>
-	</DisplayField>
-	<DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xcScanData/documentation"/>
-	</DisplayField>
-	<DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xcScanData/scanner"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xcScanData/scanner/manufacturer"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xcScanData/scanner/model"/>
-	</DisplayField>
-	<DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xcScanData/modality"/>
-	</DisplayField>
-	<DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xcScanData/frames"/>
-	</DisplayField>
-	<DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xcScanData/operator"/>
-	</DisplayField>
-	<DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xcScanData/startTime"/>
-	</DisplayField>
-	<DisplayField id="ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xcScanData/ID"/>
-	</DisplayField>
-	<DisplayField id="TYPE" header="type" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xcScanData/type"/>
-	</DisplayField>
-	<DisplayField id="UID" header="UID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xcScanData/UID"/>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="project" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xcScanData/project"/>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xcScanData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xcScanData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="XCScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="XCScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-	</DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_xcSessionData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_xcSessionData_display.xml
deleted file mode 100644
index f54854e5..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_xcSessionData_display.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:xcSessionData" full-description="XCSession" brief-description="XCSession">
-	<Arc name="PARTICIPANT_EXPERIMENT">
-		<CommonField id="PART_ID" local-field="SUBJECT_ID"/>
-		<CommonField id="DATE" local-field="DATE"/>
-		<CommonField id="EXPT_ID" local-field="EXPT_ID"/>
-	</Arc>
-	<DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xcSessionData.subject_ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
-				<InsertValue id="Field1" field="SUBJECT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xcSessionData.ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:xcSessionData','xnat:xcSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="RPT" header="ID" visible="true" image="true">
-		<Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:xcSessionData','xnat:xcSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="DATE" header="Date" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xcSessionData.date"/>
-	</DisplayField>
-	<DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
-	<DisplayFieldElement name="Field1" schema-element="xnat:xcSessionData.date"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
-	<DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
-	<Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
-	</DisplayField>
-	<DisplayField header="Projects" id="PROJECTS" data-type="string">
-		<DisplayFieldElement name="Field1" viewName="XNAT_XCSESSIONDATA_PROJECTS" viewColumn="PROJECTS"/>
-	</DisplayField>
-	<DisplayField header="Label" id="LABEL" data-type="string">
-	<DisplayFieldElement name="Field1" schema-element="xnat:xcSessionData.ID"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:xcSessionData.label"/>
-	<Content type="sql">COALESCE(@Field2, @Field1)</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:xcSessionData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:xcSessionData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:xcSessionData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:xcSessionData/search_field/xnat:xcSessionData.ID">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:xcSessionData','xnat:xcSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="TITLE" value="Inserted: @Field1 (@Field2)">
-				<InsertValue id="Field1" field="INSERT_DATE"/>
-				<InsertValue id="Field2" field="INSERT_USER"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xcSessionData.project"/>
-	</DisplayField>
-	<DisplayField id="XNAT_XCSESSIONDATA_PROJECT_IDENTIFIER" header="XNAT_XCSESSIONDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">xnat_xcsessiondata_project_id</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:xcSessionData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:xcSessionData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:xcSessionData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:xcSessionData/search_field/xnat:xcSessionData.ID/project/@Field2">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-				<InsertValue id="Field2" field="@WHERE"/>
-			</Property>
-		</HTML-Link>
-		<SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_xcsessiondata_project_id,sharing_share_xnat_experimentda_id FROM (	SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE'	UNION 	SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:xcSessionData.ID" queryField="sharing_share_xnat_experimentda_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xcSessionData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xcSessionData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayField id="XNAT_XCSESSIONDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">field</Content>
-		<SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:xcSessionData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:xcSessionData.ID" queryField="expt_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="XCSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="RPT"/>
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="XCSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="XCSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="EXPT_ID"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="XCSession" dark-color="9999CC" light-color="CCCCFF">
-	</DisplayVersion>
-	<DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="XCSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="XNAT_XCSESSIONDATA_PROJECT_IDENTIFIER"/>
-		<DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<ViewLink alias="XNAT_XCSESSIONDATA_PROJECTS">
-		<Mapping TableName="XNAT_XCSESSIONDATA_PROJECTS">
-			<MappingColumn rootElement="xnat:xcSessionData" fieldElement="xnat:xcSessionData.ID" mapsTo="id"/>
-		</Mapping>
-	</ViewLink>
-	<SQLView name="XNAT_XCSESSIONDATA_PROJECTS" sql="SELECT id, '&lt;' || expt.project || '&gt;' || xs_a_concat(',&lt;' || shared.project || '&gt;') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:xcSessionData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_xcvScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_xcvScanData_display.xml
deleted file mode 100644
index 7500ea48..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_xcvScanData_display.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:xcvScanData" full-description="XCVScan" brief-description="XCVScan">
-	<DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xcvScanData/image_session_ID"/>
-	</DisplayField>
-	<DisplayField id="NOTE" header="note" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xcvScanData/note"/>
-	</DisplayField>
-	<DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xcvScanData/quality"/>
-	</DisplayField>
-	<DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xcvScanData/condition"/>
-	</DisplayField>
-	<DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xcvScanData/series_description"/>
-	</DisplayField>
-	<DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xcvScanData/documentation"/>
-	</DisplayField>
-	<DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xcvScanData/scanner"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xcvScanData/scanner/manufacturer"/>
-	</DisplayField>
-	<DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xcvScanData/scanner/model"/>
-	</DisplayField>
-	<DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xcvScanData/modality"/>
-	</DisplayField>
-	<DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xcvScanData/frames"/>
-	</DisplayField>
-	<DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xcvScanData/operator"/>
-	</DisplayField>
-	<DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xcvScanData/startTime"/>
-	</DisplayField>
-	<DisplayField id="ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xcvScanData/ID"/>
-	</DisplayField>
-	<DisplayField id="TYPE" header="type" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xcvScanData/type"/>
-	</DisplayField>
-	<DisplayField id="UID" header="UID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xcvScanData/UID"/>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="project" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xcvScanData/project"/>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xcvScanData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xcvScanData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="XCVScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="XCVScan" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="IMAGE_SESSION_ID"/>
-		<DisplayFieldRef id="NOTE"/>
-		<DisplayFieldRef id="QUALITY"/>
-		<DisplayFieldRef id="CONDITION"/>
-		<DisplayFieldRef id="SERIES_DESCRIPTION"/>
-		<DisplayFieldRef id="DOCUMENTATION"/>
-		<DisplayFieldRef id="SCANNER"/>
-		<DisplayFieldRef id="SCANNER_MANUFACTURER"/>
-		<DisplayFieldRef id="SCANNER_MODEL"/>
-		<DisplayFieldRef id="MODALITY"/>
-		<DisplayFieldRef id="FRAMES"/>
-		<DisplayFieldRef id="OPERATOR"/>
-		<DisplayFieldRef id="STARTTIME"/>
-		<DisplayFieldRef id="ID"/>
-		<DisplayFieldRef id="TYPE"/>
-		<DisplayFieldRef id="UID"/>
-		<DisplayFieldRef id="PROJECT"/>
-	</DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_xcvSessionData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_xcvSessionData_display.xml
deleted file mode 100644
index 4661c0ce..00000000
--- a/src/main/webapp/schemas/xnat/display/xnat_xcvSessionData_display.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:xcvSessionData" full-description="XCVSession" brief-description="XCVSession">
-	<Arc name="PARTICIPANT_EXPERIMENT">
-		<CommonField id="PART_ID" local-field="SUBJECT_ID"/>
-		<CommonField id="DATE" local-field="DATE"/>
-		<CommonField id="EXPT_ID" local-field="EXPT_ID"/>
-	</Arc>
-	<DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xcvSessionData.subject_ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
-				<InsertValue id="Field1" field="SUBJECT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xcvSessionData.ID"/>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:xcvSessionData','xnat:xcvSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="RPT" header="ID" visible="true" image="true">
-		<Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
-		<HTML-Link>
-			<Property name="HREF" value="none"/>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:xcvSessionData','xnat:xcvSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="DATE" header="Date" visible="true" searchable="true">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xcvSessionData.date"/>
-	</DisplayField>
-	<DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
-	<DisplayFieldElement name="Field1" schema-element="xnat:xcvSessionData.date"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
-	<DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
-	<Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
-	</DisplayField>
-	<DisplayField header="Projects" id="PROJECTS" data-type="string">
-		<DisplayFieldElement name="Field1" viewName="XNAT_XCVSESSIONDATA_PROJECTS" viewColumn="PROJECTS"/>
-	</DisplayField>
-	<DisplayField header="Label" id="LABEL" data-type="string">
-	<DisplayFieldElement name="Field1" schema-element="xnat:xcvSessionData.ID"/>
-	<DisplayFieldElement name="Field2" schema-element="xnat:xcvSessionData.label"/>
-	<Content type="sql">COALESCE(@Field2, @Field1)</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:xcvSessionData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:xcvSessionData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:xcvSessionData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:xcvSessionData/search_field/xnat:xcvSessionData.ID">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="ONCLICK" value="return rpt('@Field1','xnat:xcvSessionData','xnat:xcvSessionData.ID');">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-			</Property>
-			<Property name="TITLE" value="Inserted: @Field1 (@Field2)">
-				<InsertValue id="Field1" field="INSERT_DATE"/>
-				<InsertValue id="Field2" field="INSERT_USER"/>
-			</Property>
-		</HTML-Link>
-	</DisplayField>
-	<DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xcvSessionData.project"/>
-	</DisplayField>
-	<DisplayField id="XNAT_XCVSESSIONDATA_PROJECT_IDENTIFIER" header="XNAT_XCVSESSIONDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">xnat_xcvsessiondata_project_id</Content>
-		<HTML-Link>
-			<SecureLink elementName="xnat:xcvSessionData">
-				<securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:xcvSessionData/sharing/share/project"/>
-				<securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:xcvSessionData/project"/>
-			</SecureLink>
-			<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:xcvSessionData/search_field/xnat:xcvSessionData.ID/project/@Field2">
-				<InsertValue id="Field1" field="EXPT_ID"/>
-				<InsertValue id="Field2" field="@WHERE"/>
-			</Property>
-		</HTML-Link>
-		<SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_xcvsessiondata_project_id,sharing_share_xnat_experimentda_id FROM (	SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE'	UNION 	SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:xcvSessionData.ID" queryField="sharing_share_xnat_experimentda_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xcvSessionData.meta.insert_date"/>
-	</DisplayField>
-	<DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
-		<DisplayFieldElement name="Field1" schema-element="xnat:xcvSessionData.meta.insert_user.login"/>
-	</DisplayField>
-	<DisplayField id="XNAT_XCVSESSIONDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
-		<Content type="sql">field</Content>
-		<SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:xcvSessionData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
-		<MappingColumns>
-			<MappingColumn schemaField="xnat:xcvSessionData.ID" queryField="expt_id"/>
-		</MappingColumns>
-	</DisplayField>
-	<DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="XCVSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="RPT"/>
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="XCVSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="LABEL"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="XCVSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="EXPT_ID"/>
-		<DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="XCVSession" dark-color="9999CC" light-color="CCCCFF">
-	</DisplayVersion>
-	<DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="XCVSession" dark-color="9999CC" light-color="CCCCFF">
-		<DisplayFieldRef id="XNAT_XCVSESSIONDATA_PROJECT_IDENTIFIER"/>
-		<DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
-		<DisplayFieldRef id="DATE"/>
-		<DisplayFieldRef id="AGE"/>
-	</DisplayVersion>
-	<ViewLink alias="XNAT_XCVSESSIONDATA_PROJECTS">
-		<Mapping TableName="XNAT_XCVSESSIONDATA_PROJECTS">
-			<MappingColumn rootElement="xnat:xcvSessionData" fieldElement="xnat:xcvSessionData.ID" mapsTo="id"/>
-		</Mapping>
-	</ViewLink>
-	<SQLView name="XNAT_XCVSESSIONDATA_PROJECTS" sql="SELECT id, '&lt;' || expt.project || '&gt;' || xs_a_concat(',&lt;' || shared.project || '&gt;') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:xcvSessionData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/xnat.xsd b/src/main/webapp/schemas/xnat/xnat.xsd
deleted file mode 100644
index 03aaa200..00000000
--- a/src/main/webapp/schemas/xnat/xnat.xsd
+++ /dev/null
@@ -1,4179 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ D:/Development/XNAT/1.6/xnat_builder_1_6dev/plugin-resources/project-skeletons/xnat/src/schemas/xnat/xnat.xsd
-  ~ XNAT http://www.xnat.org
-  ~ Copyright (c) 2014, Washington University School of Medicine
-  ~ All Rights Reserved
-  ~
-  ~ Released under the Simplified BSD.
-  ~
-  ~ Last modified 2/13/14 5:34 PM
-  -->
-<xs:schema targetNamespace="http://nrg.wustl.edu/xnat" xmlns:xnat="http://nrg.wustl.edu/xnat" xmlns:prov="http://www.nbirn.net/prov" xmlns:xdat="http://nrg.wustl.edu/xdat" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<xs:import namespace="http://www.nbirn.net/prov" schemaLocation="../birn/birnprov.xsd"/>
-	<xs:element name="Project" type="xnat:projectData"/>
-	<xs:element name="Subject" type="xnat:subjectData"/>
-	<xs:element name="Investigator" type="xnat:investigatorData"/>
-	<xs:element name="MRSession" type="xnat:mrSessionData"/>
-	<xs:element name="CTSession" type="xnat:ctSessionData"/>
-	<xs:element name="EPSSession" type="xnat:epsSessionData"/>
-	<xs:element name="HDSession" type="xnat:hdSessionData"/>
-	<xs:element name="ECGSession" type="xnat:ecgSessionData"/>
-	<xs:element name="USSession" type="xnat:usSessionData"/>
-	<xs:element name="IOSession" type="xnat:ioSessionData"/>
-	<xs:element name="MGSession" type="xnat:mgSessionData"/>
-	<xs:element name="DXSession" type="xnat:dxSessionData"/>
-	<xs:element name="CRSession" type="xnat:crSessionData"/>
-	<xs:element name="GMVSession" type="xnat:gmvSessionData"/>
-	<xs:element name="GMSession" type="xnat:gmSessionData"/>
-	<xs:element name="ESVSession" type="xnat:esvSessionData"/>
-	<xs:element name="ESSession" type="xnat:esSessionData"/>
-	<xs:element name="NMSession" type="xnat:nmSessionData"/>
-	<xs:element name="SRSession" type="xnat:srSessionData"/>
-	<xs:element name="DX3DCraniofacialSession" type="xnat:dx3DCraniofacialSessionData"/>
-	<xs:element name="XA3DSession" type="xnat:xa3DSessionData"/>
-	<xs:element name="RFSession" type="xnat:rfSessionData"/>
-	<xs:element name="XASession" type="xnat:xaSessionData"/>
-	<xs:element name="SMSession" type="xnat:smSessionData"/>
-	<xs:element name="XCSession" type="xnat:xcSessionData"/>
-	<xs:element name="XCVSession" type="xnat:xcvSessionData"/>
-	<xs:element name="OPSession" type="xnat:opSessionData"/>
-	<xs:element name="OPTSession" type="xnat:optSessionData"/>
-	<xs:element name="RTSession" type="xnat:rtSessionData"/>
-	<xs:element name="MEGSession" type="xnat:megSessionData"/>
-	<xs:element name="EEGSession" type="xnat:eegSessionData"/>
-	<xs:element name="OtherDicomSession" type="xnat:otherDicomSessionData"/>
-	<xs:element name="SubjectVariables" type="xnat:subjectVariablesData"/>
-	<xs:element name="PETSession" type="xnat:petSessionData"/>
-	<xs:element name="PETMRSession" type="xnat:petmrSessionData"/>
-	<xs:element name="MRScan" type="xnat:mrScanData"/>
-	<xs:element name="CTScan" type="xnat:ctScanData"/>
-	<xs:element name="PETScan" type="xnat:petScanData"/>
-	<xs:element name="EPSScan" type="xnat:epsScanData"/>
-	<xs:element name="HDScan" type="xnat:hdScanData"/>
-	<xs:element name="ECGScan" type="xnat:ecgScanData"/>
-	<xs:element name="USScan" type="xnat:usScanData"/>
-	<xs:element name="IOScan" type="xnat:ioScanData"/>
-	<xs:element name="MGScan" type="xnat:mgScanData"/>
-	<xs:element name="DXScan" type="xnat:dxScanData"/>
-	<xs:element name="CRScan" type="xnat:crScanData"/>
-	<xs:element name="GMVScan" type="xnat:gmvScanData"/>
-	<xs:element name="GMScan" type="xnat:gmScanData"/>
-	<xs:element name="ESVScan" type="xnat:esvScanData"/>
-	<xs:element name="ESScan" type="xnat:esScanData"/>
-	<xs:element name="NMScan" type="xnat:nmScanData"/>
-	<xs:element name="SRScan" type="xnat:srScanData"/>
-	<xs:element name="DX3DCraniofacialScan" type="xnat:dx3DCraniofacialScanData"/>
-	<xs:element name="XA3DScan" type="xnat:xa3DScanData"/>
-	<xs:element name="RFScan" type="xnat:rfScanData"/>
-	<xs:element name="XAScan" type="xnat:xaScanData"/>
-	<xs:element name="SMScan" type="xnat:smScanData"/>
-	<xs:element name="XCScan" type="xnat:xcScanData"/>
-	<xs:element name="XCVScan" type="xnat:xcvScanData"/>
-	<xs:element name="OPScan" type="xnat:opScanData"/>
-	<xs:element name="OPTScan" type="xnat:optScanData"/>
-	<xs:element name="RTImageScan" type="xnat:rtImageScanData"/>
-	<xs:element name="SCScan" type="xnat:scScanData"/>
-	<xs:element name="SegScan" type="xnat:segScanData"/>
-	<xs:element name="MRSScan" type="xnat:mrsScanData"/>
-	<xs:element name="MEGScan" type="xnat:megScanData"/>
-	<xs:element name="EEGScan" type="xnat:eegScanData"/>
-	<xs:element name="VoiceAudioScan" type="xnat:voiceAudioScanData"/>
-	<xs:element name="OtherDicomScan" type="xnat:otherDicomScanData"/>
-	<xs:element name="ImageRegionResource" type="xnat:regionResource"/>
-	<xs:element name="QCAssessment" type="xnat:qcAssessmentData"/>
-	<xs:element name="ReconstructedImage" type="xnat:reconstructedImageData"/>
-	<xs:element name="FieldDefinitionSet" type="xnat:fieldDefinitionGroup"/>
-	<xs:element name="ResourceCatalog" type="xnat:resourceCatalog"/>
-	<xs:element name="QCManualAssessment" type="xnat:qcManualAssessorData"/>
-	<xs:element name="Generic" type="xnat:genericData"/>
-	<xs:element name="PVisit" type="xnat:pVisitData"/>
-	
-
-	<xs:complexType name="projectData">
-		<xs:annotation>
-			<xs:documentation>A collection of subject involved in a unit of research</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="name" type="xs:string" minOccurs="0"/>
-			<xs:element name="description" minOccurs="0">
-				<xs:simpleType>
-					<xs:restriction base="xs:string">
-						<xs:maxLength value="10000"/>
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:element>
-			<xs:element name="keywords" type="xs:string" minOccurs="0"/>
-			<xs:element name="aliases" minOccurs="0">
-				<xs:complexType>
-					<xs:sequence minOccurs="0">
-						<xs:element name="alias" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:appinfo>
-									<xdat:element displayIdentifiers="alias"/>
-									<xdat:field uniqueComposite="VALUE">
-										<xdat:relation uniqueComposite="VALUE"/>
-									</xdat:field>
-								</xs:appinfo>
-							</xs:annotation>
-							<xs:complexType>
-								<xs:simpleContent>
-									<xs:extension base="xs:string">
-										<xs:attribute name="source" type="xs:string" use="optional"/>
-									</xs:extension>
-								</xs:simpleContent>
-							</xs:complexType>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="publications" minOccurs="0">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="publication" type="xnat:publicationResource" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="resources" minOccurs="0">
-				<xs:complexType>
-					<xs:sequence minOccurs="0">
-						<xs:element name="resource" type="xnat:abstractResource" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:appinfo>
-									<xdat:field>
-										<xdat:relation relationType="multi" relationName="xnat_projectData_resource"/>
-									</xdat:field>
-								</xs:appinfo>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="studyProtocol" type="xnat:abstractProtocol" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="PI" type="xnat:investigatorData" minOccurs="0"/>
-			<xs:element name="investigators" minOccurs="0">
-				<xs:complexType>
-					<xs:sequence minOccurs="0">
-						<xs:element name="investigator" type="xnat:investigatorData" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:appinfo>
-									<xdat:field>
-										<xdat:relation relationType="multi" relationName="xnat_projectData_investigator"/>
-									</xdat:field>
-								</xs:appinfo>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="fields" minOccurs="0">
-				<xs:complexType>
-					<xs:sequence minOccurs="0">
-						<xs:element name="field" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:appinfo>
-									<xdat:element displayIdentifiers="name"/>
-									<xdat:field>
-										<xdat:relation uniqueComposite="NAME"/>
-									</xdat:field>
-								</xs:appinfo>
-							</xs:annotation>
-							<xs:complexType>
-								<xs:simpleContent>
-									<xs:extension base="xs:string">
-										<xs:attribute name="name" type="xs:string">
-											<xs:annotation>
-												<xs:appinfo>
-													<xdat:field uniqueComposite="NAME"/>
-												</xs:appinfo>
-											</xs:annotation>
-										</xs:attribute>
-									</xs:extension>
-								</xs:simpleContent>
-							</xs:complexType>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-		</xs:sequence>
-		<xs:attribute name="ID" type="xs:string" use="required">
-			<xs:annotation>
-				<xs:appinfo>
-					<xdat:field>
-						<xdat:sqlField primaryKey="true"/>
-					</xdat:field>
-				</xs:appinfo>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="secondary_ID" type="xs:string" use="optional"/>
-	</xs:complexType>
-	<xs:complexType name="subjectData">
-		<xs:annotation>
-			<xs:appinfo>
-				<xdat:element displayIdentifiers="label"/>
-			</xs:appinfo>
-			<xs:documentation>An individual person involved in experimental research</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="sharing" minOccurs="0">
-				<xs:complexType>
-					<xs:sequence minOccurs="0">
-						<xs:element name="share" type="xnat:projectParticipant" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:appinfo>
-									<xdat:field>
-										<xdat:sqlField name="subject_id"/>
-									</xdat:field>
-								</xs:appinfo>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="resources" minOccurs="0">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="resource" type="xnat:abstractResource" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:appinfo>
-									<xdat:field>
-										<xdat:relation relationType="multi" relationName="xnat_subjectData_resource"/>
-									</xdat:field>
-								</xs:appinfo>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="investigator" type="xnat:investigatorData" minOccurs="0"/>
-			<xs:element name="demographics" type="xnat:abstractDemographicData" minOccurs="0"/>
-			<xs:element name="metadata" type="xnat:abstractSubjectMetadata" minOccurs="0"/>
-			<xs:element name="addID" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:appinfo>
-						<xdat:element displayIdentifiers="name"/>
-						<xdat:field uniqueComposite="UNIQUE_NAME_VALUE">
-							<xdat:relation uniqueComposite="UNIQUE_SUBJECT_NAME"/>
-						</xdat:field>
-					</xs:appinfo>
-				</xs:annotation>
-				<xs:complexType>
-					<xs:simpleContent>
-						<xs:extension base="xs:string">
-							<xs:attribute name="name" type="xs:string">
-								<xs:annotation>
-									<xs:appinfo>
-										<xdat:field uniqueComposite="UNIQUE_NAME_VALUE,UNIQUE_SUBJECT_NAME"/>
-									</xs:appinfo>
-								</xs:annotation>
-							</xs:attribute>
-						</xs:extension>
-					</xs:simpleContent>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="fields" minOccurs="0">
-				<xs:complexType>
-					<xs:sequence minOccurs="0">
-						<xs:element name="field" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:appinfo>
-									<xdat:element displayIdentifiers="name"/>
-									<xdat:field>
-										<xdat:relation uniqueComposite="SUBJECT_NAME"/>
-									</xdat:field>
-								</xs:appinfo>
-							</xs:annotation>
-							<xs:complexType>
-								<xs:simpleContent>
-									<xs:extension base="xs:string">
-										<xs:attribute name="name" type="xs:string">
-											<xs:annotation>
-												<xs:appinfo>
-													<xdat:field uniqueComposite="SUBJECT_NAME"/>
-												</xs:appinfo>
-											</xs:annotation>
-										</xs:attribute>
-									</xs:extension>
-								</xs:simpleContent>
-							</xs:complexType>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="experiments" minOccurs="0">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="experiment" type="xnat:subjectAssessorData" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:appinfo>
-									<xdat:field>
-										<xdat:sqlField name="subject_ID"/>
-									</xdat:field>
-								</xs:appinfo>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-		</xs:sequence>
-		<xs:attribute name="ID" use="required">
-			<xs:annotation>
-				<xs:appinfo>
-					<xdat:field>
-						<xdat:sqlField primaryKey="true"/>
-					</xdat:field>
-				</xs:appinfo>
-			</xs:annotation>
-			<xs:simpleType>
-				<xs:restriction base="xs:string"/>
-			</xs:simpleType>
-		</xs:attribute>
-		<xs:attribute name="project" type="xs:string" use="optional">
-			<xs:annotation>
-				<xs:appinfo>
-					<xdat:field baseElement="xnat:projectData" baseCol="id" uniqueComposite="PROJ_SUBJ">
-						<xdat:sqlField name="project"/>
-					</xdat:field>
-				</xs:appinfo>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="group" type="xs:string">
-			<xs:annotation>
-				<xs:appinfo>
-					<xdat:field>
-						<xdat:sqlField name="_group"/>
-					</xdat:field>
-				</xs:appinfo>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="label" type="xs:string" use="optional">
-			<xs:annotation>
-				<xs:appinfo>
-					<xdat:field uniqueComposite="PROJ_SUBJ"/>
-				</xs:appinfo>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="src" type="xs:string" use="optional"/>
-		<xs:attribute name="initials" type="xs:string" use="optional"/>
-	</xs:complexType>
-	<xs:complexType name="projectParticipant">
-		<xs:annotation>
-			<xs:appinfo>
-				<xdat:element displayIdentifiers="project"/>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:attribute name="label" type="xs:string" use="optional"/>
-		<xs:attribute name="project" type="xs:string" use="optional">
-			<xs:annotation>
-				<xs:appinfo>
-					<xdat:field baseElement="xnat:projectData" baseCol="id" uniqueComposite="PROJ_SUBJ">
-						<xdat:relation onDelete="CASCADE"/>
-						<xdat:sqlField name="project"/>
-					</xdat:field>
-				</xs:appinfo>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="subject_ID" type="xs:string" use="optional">
-			<xs:annotation>
-				<xs:appinfo>
-					<xdat:field baseElement="xnat:subjectData" baseCol="id" uniqueComposite="PROJ_SUBJ">
-						<xdat:relation onDelete="CASCADE"/>
-						<xdat:sqlField name="subject_id"/>
-					</xdat:field>
-				</xs:appinfo>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="group" type="xs:string" use="optional">
-			<xs:annotation>
-				<xs:appinfo>
-					<xdat:field>
-						<xdat:sqlField name="_group"/>
-					</xdat:field>
-				</xs:appinfo>
-			</xs:annotation>
-		</xs:attribute>
-	</xs:complexType>
-	<xs:complexType name="experimentData">
-		<xs:annotation>
-			<xs:appinfo>
-				<xdat:element displayIdentifiers="label"/>
-			</xs:appinfo>
-			<xs:documentation>A specific individual event in which primary data is obtained</xs:documentation>
-		</xs:annotation>
-		<xs:sequence minOccurs="0">
-			<xs:element name="sharing" minOccurs="0">
-				<xs:complexType>
-					<xs:sequence minOccurs="0">
-						<xs:element name="share" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:appinfo>
-									<xdat:element displayIdentifiers="project"/>
-									<xdat:field>
-										<xdat:relation uniqueComposite="PROJECT_EXPT"/>
-									</xdat:field>
-								</xs:appinfo>
-							</xs:annotation>
-							<xs:complexType>
-								<xs:simpleContent>
-									<xs:extension base="xs:string">
-										<xs:attribute name="label" type="xs:string" use="optional"/>
-										<xs:attribute name="project" type="xs:string" use="optional">
-											<xs:annotation>
-												<xs:appinfo>
-													<xdat:field baseElement="xnat:projectData" baseCol="ID" uniqueComposite="PROJECT_EXPT"/>
-												</xs:appinfo>
-											</xs:annotation>
-										</xs:attribute>
-										<xs:attribute name="visit" type="xs:string"> <!--  foreign key to visitData -->
-											<xs:annotation>
-												<xs:appinfo>
-													<xdat:field baseElement="xnat:pVisitData" baseCol="id"/>
-												</xs:appinfo>
-											</xs:annotation>
-										</xs:attribute>	
-										<xs:attribute name="protocol" type="xs:string" use="optional"/>	
-									</xs:extension>
-								</xs:simpleContent>
-							</xs:complexType>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="date" type="xs:date" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Date on which experiment was conducted</xs:documentation>
-					<xs:appinfo>
-						<xdat:field filter="true"/>
-					</xs:appinfo>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="time" type="xs:time" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Time experiment was conducted</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="duration" type="xs:duration" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Duration of experiment</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="delay" minOccurs="0">
-				<xs:complexType>
-					<xs:simpleContent>
-						<xs:extension base="xs:integer">
-							<xs:attribute name="ref_expt_id" type="xs:string"/>
-						</xs:extension>
-					</xs:simpleContent>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="note" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Free form text for misc. information</xs:documentation>
-				</xs:annotation>
-				<xs:simpleType>
-					<xs:restriction base="xs:string">
-						<xs:maxLength value="1500"/>
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:element>
-			<xs:element name="investigator" type="xnat:investigatorData" minOccurs="0"/>
-			<xs:element name="validation" type="xnat:validationData" minOccurs="0"/>
-			<xs:element name="resources" minOccurs="0">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="resource" type="xnat:abstractResource" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:appinfo>
-									<xdat:field>
-										<xdat:relation relationType="multi" relationName="xnat_experimentData_resource"/>
-									</xdat:field>
-								</xs:appinfo>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="fields" minOccurs="0">
-				<xs:complexType>
-					<xs:sequence minOccurs="0">
-						<xs:element name="field" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:appinfo>
-									<xdat:element displayIdentifiers="name"/>
-									<xdat:field>
-										<xdat:relation uniqueComposite="NAME"/>
-									</xdat:field>
-								</xs:appinfo>
-							</xs:annotation>
-							<xs:complexType>
-								<xs:simpleContent>
-									<xs:extension base="xs:string">
-										<xs:attribute name="name" type="xs:string">
-											<xs:annotation>
-												<xs:appinfo>
-													<xdat:field uniqueComposite="NAME"/>
-												</xs:appinfo>
-											</xs:annotation>
-										</xs:attribute>
-									</xs:extension>
-								</xs:simpleContent>
-							</xs:complexType>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="acquisition_site" type="xs:string" minOccurs="0"/>
-		</xs:sequence>
-		<xs:attribute name="ID" type="xs:string" use="required">
-			<xs:annotation>
-				<xs:appinfo>
-					<xdat:field>
-						<xdat:sqlField primaryKey="true"/>
-					</xdat:field>
-				</xs:appinfo>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="project" type="xs:string" use="optional">
-			<xs:annotation>
-				<xs:appinfo>
-					<xdat:field baseElement="xnat:projectData" baseCol="id" uniqueComposite="PROJ_LABEL"/>
-				</xs:appinfo>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="visit_id" type="xs:string" use="optional"/>  <!--  Left here for legacy visit impl. -->
-		<xs:attribute name="visit" type="xs:string"> <!--  foreign key to visitData -->
-			<xs:annotation>
-				<xs:appinfo>
-					<xdat:field baseElement="xnat:pVisitData" baseCol="id"/>
-				</xs:appinfo>
-			</xs:annotation>
-		</xs:attribute>	
-		<xs:attribute name="version" type="xs:integer" use="optional"/>
-		<xs:attribute name="original" type="xs:string" use="optional"/>	
-		<xs:attribute name="protocol" type="xs:string" use="optional"/>	
-		<xs:attribute name="label" type="xs:string">
-			<xs:annotation>
-				<xs:appinfo>
-					<xdat:field uniqueComposite="PROJ_LABEL"/>
-				</xs:appinfo>
-			</xs:annotation>
-		</xs:attribute>
-	</xs:complexType>
-	<xs:complexType name="genericData">
-		<xs:complexContent>
-			<xs:extension base="xnat:experimentData">
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	
-	<xs:complexType name="pVisitData">
-		<xs:complexContent>
-			<xs:extension base="xnat:genericData">
-				<xs:sequence>
-					<xs:element name="subject_ID" type="xs:string" minOccurs="0">
-						<xs:annotation>
-							<xs:appinfo>
-								<xdat:field baseElement="xnat:subjectData" baseCol="id"/>
-							</xs:appinfo>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="visit_type" type="xs:string" minOccurs="0"/>
-					<xs:element name="visit_name" type="xs:string" minOccurs="0"/> <!-- interval... -->
-					<xs:element name="notes" minOccurs="0" maxOccurs="1">
-						<xs:annotation>
-							<xs:documentation>
-								Can be used to take visit notes, explain reason for status (e.g. missed visit), etc.
-							</xs:documentation>
-						</xs:annotation>
-						<xs:simpleType>
-							<xs:restriction base="xs:string">
-								<xs:maxLength value="10000"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element name="start_date" type="xs:dateTime" minOccurs="0" maxOccurs="1"/>
-					<xs:element name="end_date" type="xs:dateTime" minOccurs="0" maxOccurs="1"/>
-				</xs:sequence>
-				<xs:attribute name="closed" type="xs:boolean" use="optional"/>
-				<xs:attribute name="terminal" type="xs:boolean" use="optional"/>
-				<xs:attribute name="status" type="xs:string" use="optional"/>
-                <xs:attribute name="protocolVersion" type="xs:integer" use="optional"/>
-                <xs:attribute name="protocolId" type="xs:string" use="optional"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-
-	<xs:complexType name="abstractSubjectMetadata">
-		<xs:annotation>
-			<xs:appinfo>
-				<xdat:element ignoreWarnings="true"/>
-			</xs:appinfo>
-		</xs:annotation>
-	</xs:complexType>
-	<xs:complexType name="subjectMetadata">
-		<xs:annotation>
-			<xs:appinfo>
-				<xdat:element ignoreWarnings="true"/>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:abstractSubjectMetadata">
-				<xs:sequence>
-					<xs:element name="cohort" type="xs:string" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Free form text to indicate recruitment/subject pool</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="abstractDemographicData">
-		<xs:annotation>
-			<xs:appinfo>
-				<xdat:element ignoreWarnings="true"/>
-			</xs:appinfo>
-		</xs:annotation>
-	</xs:complexType>
-	<xs:complexType name="demographicData">
-		<xs:annotation>
-			<xs:appinfo>
-				<xdat:element ignoreWarnings="true"/>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:abstractDemographicData">
-				<xs:sequence>
-					<xs:choice minOccurs="0">
-						<xs:element name="dob" type="xs:date"/>
-						<xs:element name="yob">
-							<xs:simpleType>
-								<xs:restriction base="xs:integer"/>
-							</xs:simpleType>
-						</xs:element>
-						<xs:element name="age" type="xs:integer"/>
-					</xs:choice>
-					<xs:element name="gender" minOccurs="0">
-						<xs:simpleType>
-							<xs:restriction base="xs:string">
-								<xs:enumeration value="male"/>
-								<xs:enumeration value="female"/>
-								<xs:enumeration value="other"/>
-								<xs:enumeration value="unknown"/>
-								<xs:enumeration value="M"/>
-								<xs:enumeration value="F"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element name="handedness" minOccurs="0">
-						<xs:simpleType>
-							<xs:restriction base="xs:string">
-								<xs:enumeration value="left"/>
-								<xs:enumeration value="right"/>
-								<xs:enumeration value="ambidextrous"/>
-								<xs:enumeration value="unknown"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element name="ses" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Socioeconomic status</xs:documentation>
-						</xs:annotation>
-						<xs:simpleType>
-							<xs:restriction base="xs:integer"/>
-						</xs:simpleType>
-					</xs:element>
-                    <xs:element name="employment" minOccurs="0">
-                        <xs:annotation>
-                            <xs:documentation>
-                                Employment status:
-                                0: Employed
-                                1: Unemployed
-                                2: Retired
-                                3: Unknown or N/A
-                            </xs:documentation>
-                        </xs:annotation>
-                        <xs:simpleType>
-                            <xs:restriction base="xs:integer">
-                                <xs:minInclusive value="0"/>
-                                <xs:maxInclusive value="3"/>
-                            </xs:restriction>
-                        </xs:simpleType>
-                    </xs:element>
-					<xs:element name="education" minOccurs="0">
-						<xs:simpleType>
-							<xs:restriction base="xs:integer">
-								<xs:minInclusive value="0"/>
-								<xs:maxInclusive value="30"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element name="educationDesc" type="xs:string" minOccurs="0"/>
-					<xs:element name="race" type="xs:string" minOccurs="0"/>
-					<xs:element name="race2" type="xs:string" minOccurs="0"/>
-					<xs:element name="race3" type="xs:string" minOccurs="0"/>
-					<xs:element name="race4" type="xs:string" minOccurs="0"/>
-					<xs:element name="race5" type="xs:string" minOccurs="0"/>
-					<xs:element name="race6" type="xs:string" minOccurs="0"/>
-					<xs:element name="ethnicity" type="xs:string" minOccurs="0"/>
-					<xs:element name="weight" minOccurs="0">
-						<xs:complexType>
-							<xs:simpleContent>
-								<xs:extension base="xs:float">
-									<xs:attribute name="units" type="xs:string"/>
-								</xs:extension>
-							</xs:simpleContent>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="height" minOccurs="0">
-						<xs:complexType>
-							<xs:simpleContent>
-								<xs:extension base="xs:float">
-									<xs:attribute name="units" type="xs:string"/>
-								</xs:extension>
-							</xs:simpleContent>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="gestational_age" type="xs:float" minOccurs="0"/>
-					<xs:element name="post_menstrual_age" type="xs:float" minOccurs="0"/>
-					<xs:element name="birth_weight" type="xs:float" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="subjectAssessorData">
-		<xs:complexContent>
-			<xs:extension base="xnat:experimentData">
-				<xs:sequence>
-					<xs:element name="subject_ID" type="xs:string">
-						<xs:annotation>
-							<xs:appinfo>
-								<xdat:field baseElement="xnat:subjectData" baseCol="id"/>
-							</xs:appinfo>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="age" type="xs:float" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="subjectVariablesData">
-		<xs:complexContent>
-			<xs:extension base="xnat:subjectAssessorData">
-				<xs:sequence>
-					<xs:element name="variables" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="variable" minOccurs="0" maxOccurs="unbounded">
-									<xs:annotation>
-										<xs:appinfo>
-											<xdat:field>
-												<xdat:relation uniqueComposite="FK_NAME"/>
-											</xdat:field>
-										</xs:appinfo>
-									</xs:annotation>
-									<xs:complexType>
-										<xs:simpleContent>
-											<xs:extension base="xs:string">
-												<xs:attribute name="name" type="xs:string">
-													<xs:annotation>
-														<xs:appinfo>
-															<xdat:field uniqueComposite="FK_NAME"/>
-														</xs:appinfo>
-													</xs:annotation>
-												</xs:attribute>
-											</xs:extension>
-										</xs:simpleContent>
-									</xs:complexType>
-								</xs:element>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="imageSessionData">
-		<xs:complexContent>
-			<xs:extension base="xnat:subjectAssessorData">
-				<xs:sequence>
-					<xs:element name="regions" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="region" type="xnat:regionResource" minOccurs="0" maxOccurs="unbounded">
-									<xs:annotation>
-										<xs:appinfo>
-											<xdat:field>
-												<xdat:sqlField name="session_id"/>
-												<xdat:relation relationType="single"/>
-											</xdat:field>
-										</xs:appinfo>
-									</xs:annotation>
-								</xs:element>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="scanner" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Free form text to indicate name/ID of scanner</xs:documentation>
-						</xs:annotation>
-						<xs:complexType>
-							<xs:simpleContent>
-								<xs:extension base="xs:string">
-									<xs:attribute name="manufacturer" type="xs:string" use="optional"/>
-									<xs:attribute name="model" type="xs:string" use="optional"/>
-								</xs:extension>
-							</xs:simpleContent>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="operator" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Free form text to indicate individuals who operated scanner</xs:documentation>
-						</xs:annotation>
-						<xs:simpleType>
-							<xs:restriction base="xs:string">
-								<xs:maxLength value="255"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element name="prearchivePath" minOccurs="0">
-						<xs:simpleType>
-							<xs:restriction base="xs:string">
-								<xs:maxLength value="255"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element name="scans" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="scan" type="xnat:imageScanData" minOccurs="0" maxOccurs="unbounded">
-									<xs:annotation>
-										<xs:appinfo>
-											<xdat:field>
-												<xdat:sqlField name="image_session_id"/>
-												<xdat:relation uniqueComposite="mr_id_fk" relationType="single"/>
-											</xdat:field>
-										</xs:appinfo>
-									</xs:annotation>
-								</xs:element>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="reconstructions" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="reconstructedImage" type="xnat:reconstructedImageData" minOccurs="0" maxOccurs="unbounded">
-									<xs:annotation>
-										<xs:appinfo>
-											<xdat:field>
-												<xdat:sqlField name="image_session_id"/>
-											</xdat:field>
-										</xs:appinfo>
-									</xs:annotation>
-								</xs:element>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="assessors" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="assessor" type="xnat:imageAssessorData" minOccurs="0" maxOccurs="unbounded">
-									<xs:annotation>
-										<xs:appinfo>
-											<xdat:field>
-												<xdat:sqlField name="imageSession_ID"/>
-												<xdat:relation relationType="single"/>
-											</xdat:field>
-										</xs:appinfo>
-									</xs:annotation>
-								</xs:element>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="dcmAccessionNumber" type="xs:string" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>DICOM Accession Number (0008,0050)</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="dcmPatientId" type="xs:string" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>DICOM Patient ID (0010,0020)</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="dcmPatientName" type="xs:string" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>DICOM Patient's Name (0010,0010)</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="dcmPatientBirthDate" type="xs:date" minOccurs="0">
-					        <xs:annotation>
-						        <xs:documentation>DICOM Patient's Birth Date (0010,0030)</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-				</xs:sequence>
-				<xs:attribute name="session_type" type="xs:string" use="optional"/>
-				<xs:attribute name="modality" type="xs:string"/>
-				<xs:attribute name="UID" type="xs:string" use="optional">
-					<xs:annotation>
-						<xs:documentation>DICOM Study Instance UID (0020,000D)</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="mrSessionData">
-		<xs:annotation>
-			<xs:documentation>An event in which MR scans are obtained on a subject</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageSessionData">
-				<xs:sequence minOccurs="0">
-					<xs:element name="coil" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Free form text to indicate the coil used in this scanning session</xs:documentation>
-						</xs:annotation>
-						<xs:simpleType>
-							<xs:restriction base="xs:string">
-								<xs:maxLength value="255"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element name="fieldStrength" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Free form text to indicate the field strength used in this scanning session</xs:documentation>
-						</xs:annotation>
-						<xs:simpleType>
-							<xs:restriction base="xs:string">
-								<xs:maxLength value="255"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element name="marker" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Free form text to indicate method used to mark left-right (e.g. Vitamin E capsule)</xs:documentation>
-						</xs:annotation>
-						<xs:simpleType>
-							<xs:restriction base="xs:string">
-								<xs:maxLength value="255"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element name="stabilization" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Free form text to indicate method used to stabilize head</xs:documentation>
-						</xs:annotation>
-						<xs:simpleType>
-							<xs:restriction base="xs:string">
-								<xs:maxLength value="255"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- DEPRECATED: This data type is deprecated. You should only extend from imageAssessorData directly. -->
-	<xs:complexType name="mrAssessorData">
-		<xs:annotation>
-			<xs:documentation>A processing event in which primary or derived MR data is analyzed</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageAssessorData"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="mrScanData">
-		<xs:annotation>
-			<xs:documentation>Information about an individual MR scan sequence</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageScanData">
-				<xs:sequence minOccurs="0">
-					<xs:element name="coil" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Free form text to indicate the coil used in this scanning session</xs:documentation>
-						</xs:annotation>
-						<xs:simpleType>
-							<xs:restriction base="xs:string">
-								<xs:maxLength value="255"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element name="fieldStrength" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Free form text to indicate the field strength used in this scanning session</xs:documentation>
-						</xs:annotation>
-						<xs:simpleType>
-							<xs:restriction base="xs:string">
-								<xs:maxLength value="255"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element name="marker" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Free form text to indicate method used to mark left-right (e.g. Vitamin E capsule)</xs:documentation>
-						</xs:annotation>
-						<xs:simpleType>
-							<xs:restriction base="xs:string">
-								<xs:maxLength value="255"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element name="stabilization" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Free form text to indicate method used to stabilize head</xs:documentation>
-						</xs:annotation>
-						<xs:simpleType>
-							<xs:restriction base="xs:string">
-								<xs:maxLength value="255"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element name="parameters" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="voxelRes" minOccurs="0">
-									<xs:complexType>
-										<xs:attribute name="units" type="xs:string"/>
-										<xs:attribute name="x" type="xs:float"/>
-										<xs:attribute name="y" type="xs:float"/>
-										<xs:attribute name="z" type="xs:float"/>
-									</xs:complexType>
-								</xs:element>
-								<xs:element name="orientation" minOccurs="0">
-									<xs:simpleType>
-										<xs:restriction base="xs:string">
-											<xs:maxLength value="5"/>
-										</xs:restriction>
-									</xs:simpleType>
-								</xs:element>
-								<xs:element name="fov" minOccurs="0">
-									<xs:complexType>
-										<xs:attribute name="x" type="xs:integer"/>
-										<xs:attribute name="y" type="xs:integer"/>
-									</xs:complexType>
-								</xs:element>
-								<xs:element name="matrix" minOccurs="0">
-									<xs:complexType>
-										<xs:attribute name="x" type="xs:integer" use="optional"/>
-										<xs:attribute name="y" type="xs:integer" use="optional"/>
-									</xs:complexType>
-								</xs:element>
-								<xs:element name="partitions" type="xs:integer" minOccurs="0"/>
-								<xs:element name="tr" type="xs:float" minOccurs="0"/>
-								<xs:element name="te" type="xs:float" minOccurs="0"/>
-								<xs:element name="ti" type="xs:float" minOccurs="0"/>
-								<xs:element name="flip" type="xs:integer" minOccurs="0"/>
-								<xs:element name="sequence" minOccurs="0">
-									<xs:simpleType>
-										<xs:restriction base="xs:string">
-											<xs:maxLength value="255"/>
-										</xs:restriction>
-									</xs:simpleType>
-								</xs:element>
-								<xs:element name="origin" minOccurs="0">
-									<xs:simpleType>
-										<xs:restriction base="xs:string">
-											<xs:maxLength value="255"/>
-										</xs:restriction>
-									</xs:simpleType>
-								</xs:element>
-								<xs:element name="imageType" type="xs:string" minOccurs="0"/>
-								<xs:element name="scanSequence" type="xs:string" minOccurs="0"/>
-								<xs:element name="seqVariant" type="xs:string" minOccurs="0"/>
-								<xs:element name="scanOptions" type="xs:string" minOccurs="0"/>
-								<xs:element name="acqType" type="xs:string" minOccurs="0"/>
-								<xs:element name="coil" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>Free form text to indicate the coil used in this scan</xs:documentation>
-									</xs:annotation>
-									<xs:simpleType>
-										<xs:restriction base="xs:string">
-											<xs:maxLength value="255"/>
-										</xs:restriction>
-									</xs:simpleType>
-								</xs:element>
-								<xs:element name="dtiAcqCount" type="xs:integer" minOccurs="0"/>
-								<xs:element name="pixelBandwidth" type="xs:double" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>Reciprocal of the total sampling period, in Hz/pixel</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="diffusion" minOccurs="0">
-									<xs:complexType>
-										<xs:sequence>
-											<xs:element name="bValues" minOccurs="0" type="xs:string"/>
-											<xs:element name="directionality" minOccurs="0" type="xs:string"/>
-											<xs:element name="orientations" minOccurs="0" type="xs:string"/>
-											<xs:element name="anisotropyType" minOccurs="0" type="xs:string"/>
-										</xs:sequence>
-									</xs:complexType>
-								</xs:element>
-								<xs:element name="addParam" type="xnat:addField" minOccurs="0" maxOccurs="unbounded">
-									<xs:annotation>
-										<xs:appinfo>
-											<xdat:field>
-												<xdat:relation uniqueComposite="SCAN"/>
-											</xdat:field>
-										</xs:appinfo>
-									</xs:annotation>
-								</xs:element>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="dcmValidation" minOccurs="0">
-						<xs:complexType>
-							<xs:simpleContent>
-								<xs:extension base="xs:string">
-									<xs:attribute name="status" type="xs:boolean" use="optional"/>
-								</xs:extension>
-							</xs:simpleContent>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="derivedData">
-		<xs:annotation>
-			<xs:documentation>A processing event in which data is analyzed</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:experimentData">
-				<xs:sequence minOccurs="0">
-					<xs:element name="provenance" type="prov:process" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="reconstructedImageData">
-		<xs:annotation>
-			<xs:appinfo>
-				<xdat:element displayIdentifiers="ID"/>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="image_session_ID" type="xs:string">
-				<xs:annotation>
-					<xs:appinfo>
-						<xdat:field baseElement="xnat:imageSessionData" baseCol="ID"/>
-					</xs:appinfo>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="inScans" minOccurs="0">
-				<xs:complexType>
-					<xs:sequence minOccurs="0">
-						<xs:element name="scanID" type="xs:string" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:appinfo>
-									<xdat:field uniqueComposite="IN_SCAN">
-										<xdat:relation uniqueComposite="IN_SCAN"/>
-									</xdat:field>
-								</xs:appinfo>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="in" minOccurs="0">
-				<xs:complexType>
-					<xs:sequence minOccurs="0">
-						<xs:element name="file" type="xnat:abstractResource" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:appinfo>
-									<xdat:field displayName="in resource">
-										<xdat:relation relationType="multi" relationName="recon_in_resource"/>
-									</xdat:field>
-								</xs:appinfo>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="out" minOccurs="0">
-				<xs:complexType>
-					<xs:sequence minOccurs="0">
-						<xs:element name="file" type="xnat:abstractResource" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:appinfo>
-									<xdat:field displayName="out resource">
-										<xdat:relation relationType="multi" relationName="recon_out_resource"/>
-									</xdat:field>
-								</xs:appinfo>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="provenance" type="prov:process" minOccurs="0"/>
-			<xs:element name="parameters" minOccurs="0">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="addParam" type="xnat:addField" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:appinfo>
-									<xdat:field>
-										<xdat:relation uniqueComposite="RECON"/>
-									</xdat:field>
-								</xs:appinfo>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="computations" minOccurs="0">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="datum" type="xnat:computationData" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:appinfo>
-									<xdat:field>
-										<xdat:relation uniqueComposite="PET_RECON"/>
-									</xdat:field>
-								</xs:appinfo>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-		</xs:sequence>
-		<xs:attribute name="ID" type="xs:string">
-			<xs:annotation>
-				<xs:appinfo>
-					<xdat:field unique="true"/>
-				</xs:appinfo>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="type" type="xs:string"/>
-		<xs:attribute name="baseScanType" type="xs:string"/>
-	</xs:complexType>
-	<xs:complexType name="investigatorData">
-		<xs:annotation>
-			<xs:appinfo>
-				<xdat:element displayIdentifiers="lastname"/>
-			</xs:appinfo>
-			<xs:documentation>An indivudal who maintains authority over experimental data</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="title" minOccurs="0">
-				<xs:simpleType>
-					<xs:restriction base="xs:string">
-						<xs:maxLength value="10"/>
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:element>
-			<xs:element name="firstname">
-				<xs:annotation>
-					<xs:appinfo>
-						<xdat:field uniqueComposite="true"/>
-					</xs:appinfo>
-				</xs:annotation>
-				<xs:simpleType>
-					<xs:restriction base="xs:string">
-						<xs:maxLength value="25"/>
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:element>
-			<xs:element name="lastname">
-				<xs:annotation>
-					<xs:appinfo>
-						<xdat:field uniqueComposite="true"/>
-					</xs:appinfo>
-				</xs:annotation>
-				<xs:simpleType>
-					<xs:restriction base="xs:string">
-						<xs:maxLength value="25"/>
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:element>
-			<xs:element name="institution" minOccurs="0">
-				<xs:simpleType>
-					<xs:restriction base="xs:string">
-						<xs:maxLength value="255"/>
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:element>
-			<xs:element name="department" minOccurs="0">
-				<xs:simpleType>
-					<xs:restriction base="xs:string">
-						<xs:maxLength value="128"/>
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:element>
-			<xs:element name="email" minOccurs="0">
-				<xs:simpleType>
-					<xs:restriction base="xs:string">
-						<xs:maxLength value="64"/>
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:element>
-			<xs:element name="phone" minOccurs="0">
-				<xs:simpleType>
-					<xs:restriction base="xs:string">
-						<xs:maxLength value="25"/>
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:element>
-		</xs:sequence>
-		<xs:attribute name="ID" type="xs:string"/>
-	</xs:complexType>
-	<xs:complexType name="volumetricRegion">
-		<xs:annotation>
-			<xs:documentation>Generic volumetric region type</xs:documentation>
-			<xs:appinfo>
-				<xdat:element ignoreWarnings="true" matchByValues="true" displayIdentifiers="name"/>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:sequence minOccurs="0">
-			<xs:element name="subregions" minOccurs="0">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="subregion" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:appinfo>
-									<xdat:element displayIdentifiers="name"/>
-									<xdat:field>
-										<xdat:relation uniqueComposite="true"/>
-									</xdat:field>
-								</xs:appinfo>
-							</xs:annotation>
-							<xs:complexType>
-								<xs:attribute name="name" type="xs:string">
-									<xs:annotation>
-										<xs:appinfo>
-											<xdat:field uniqueComposite="true"/>
-										</xs:appinfo>
-									</xs:annotation>
-								</xs:attribute>
-								<xs:attribute name="voxels" type="xs:float"/>
-							</xs:complexType>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-		</xs:sequence>
-		<xs:attribute name="name" type="xs:string"/>
-		<xs:attribute name="units" type="xs:string" use="optional"/>
-		<xs:attribute name="voxels" type="xs:integer"/>
-		<xs:attribute name="hemisphere">
-			<xs:simpleType>
-				<xs:restriction base="xs:string">
-					<xs:enumeration value="both"/>
-					<xs:enumeration value="left"/>
-					<xs:enumeration value="right"/>
-				</xs:restriction>
-			</xs:simpleType>
-		</xs:attribute>
-	</xs:complexType>
-	<xs:complexType name="addField">
-		<xs:annotation>
-			<xs:appinfo>
-				<xdat:element displayIdentifiers="name"/>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:simpleContent>
-			<xs:extension base="xs:string">
-				<xs:attribute name="name" type="xs:string">
-					<xs:annotation>
-						<xs:appinfo>
-							<xdat:field uniqueComposite="SCAN,RECON,ASSESSOR,PET_SCAN"/>
-						</xs:appinfo>
-					</xs:annotation>
-				</xs:attribute>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<xs:complexType name="validationData">
-		<xs:annotation>
-			<xs:appinfo>
-				<xdat:element ignoreWarnings="true"  displayIdentifiers="status"/>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="method" type="xs:string" minOccurs="0"/>
-			<xs:element name="date" type="xs:date" minOccurs="0"/>
-			<xs:element name="notes" minOccurs="0">
-				<xs:simpleType>
-					<xs:restriction base="xs:string">
-						<xs:maxLength value="500"/>
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:element>
-			<xs:element name="validated_by" type="xs:string" minOccurs="0"/>
-		</xs:sequence>
-		<xs:attribute name="status" type="xs:string"/>
-	</xs:complexType>
-	<xs:complexType name="abstractResource">
-		<xs:annotation>
-			<xs:appinfo>
-				<xdat:element ignoreWarnings="true" abstract="true" displayIdentifiers="label"/>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:sequence minOccurs="0">
-			<xs:element name="note" minOccurs="0">
-				<xs:simpleType>
-					<xs:restriction base="xs:string">
-						<xs:maxLength value="10000"/>
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:element>
-			<xs:element name="tags" minOccurs="0">
-				<xs:complexType>
-					<xs:sequence minOccurs="0">
-						<xs:element name="tag" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:appinfo>
-									<xdat:element  displayIdentifiers="name"/>
-									<xdat:field uniqueComposite="catalog_tag">
-										<xdat:relation uniqueComposite="catalog_tag"/>
-									</xdat:field>
-								</xs:appinfo>
-							</xs:annotation>
-							<xs:complexType>
-								<xs:simpleContent>
-									<xs:extension base="xs:string">
-										<xs:attribute name="name" type="xs:string" use="optional"/>
-									</xs:extension>
-								</xs:simpleContent>
-							</xs:complexType>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-		</xs:sequence>
-		<xs:attribute name="label" type="xs:string" use="optional"/>
-		<xs:attribute name="file_count" type="xs:integer" use="optional"/>
-		<xs:attribute name="file_size" type="xs:long" use="optional"/>
-	</xs:complexType>
-	<xs:complexType name="resource">
-		<xs:complexContent>
-			<xs:extension base="xnat:abstractResource">
-				<xs:sequence>
-					<xs:element name="provenance" type="prov:process" minOccurs="0"/>
-				</xs:sequence>
-				<xs:attribute name="URI" use="required">
-					<xs:annotation>
-						<xs:appinfo>
-							<xdat:field unique="true"/>
-						</xs:appinfo>
-					</xs:annotation>
-					<xs:simpleType>
-						<xs:restriction base="xs:anyURI">
-							<xs:maxLength value="255"/>
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:attribute>
-				<xs:attribute name="format" type="xs:string" use="optional">
-					<xs:annotation>
-						<xs:documentation>Format of file. E.g. DICOM, Analyze, 4dfp</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="description" type="xs:string" use="optional">
-					<xs:annotation>
-						<xs:documentation>Free-form comments about file</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="content" type="xs:string" use="optional">
-					<xs:annotation>
-						<xs:documentation>Code indicating the contents of the image. E.g. GFC, T88</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="cachePath" use="optional">
-					<xs:simpleType>
-						<xs:restriction base="xs:string">
-							<xs:maxLength value="255"/>
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:attribute>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="imageResource">
-		<xs:complexContent>
-			<xs:extension base="xnat:resource">
-				<xs:sequence>
-					<xs:element name="dimensions" minOccurs="0">
-						<xs:complexType>
-							<xs:attribute name="x" type="xs:integer"/>
-							<xs:attribute name="y" type="xs:integer"/>
-							<xs:attribute name="z" type="xs:integer"/>
-							<xs:attribute name="volumes" type="xs:integer"/>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="voxelRes" minOccurs="0">
-						<xs:complexType>
-							<xs:attribute name="x" type="xs:float"/>
-							<xs:attribute name="y" type="xs:float"/>
-							<xs:attribute name="z" type="xs:float"/>
-							<xs:attribute name="units" type="xs:string"/>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="orientation" minOccurs="0">
-						<xs:simpleType>
-							<xs:restriction base="xs:string"/>
-						</xs:simpleType>
-					</xs:element>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="resourceSeries">
-		<xs:complexContent>
-			<xs:extension base="xnat:abstractResource">
-				<xs:attribute name="path" type="xs:anyURI" use="required">
-					<xs:annotation>
-						<xs:appinfo>
-							<xdat:field uniqueComposite="PATTERN_PATH"/>
-						</xs:appinfo>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="pattern" type="xs:string" use="required">
-					<xs:annotation>
-						<xs:appinfo>
-							<xdat:field uniqueComposite="PATTERN_PATH"/>
-						</xs:appinfo>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="count" type="xs:integer" use="optional"/>
-				<xs:attribute name="name" type="xs:string" use="optional"/>
-				<xs:attribute name="format" type="xs:string" use="optional">
-					<xs:annotation>
-						<xs:documentation>Format of file. E.g. DICOM, Analyze, 4dfp</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="description" type="xs:string" use="optional">
-					<xs:annotation>
-						<xs:documentation>Free-form comments about files</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="content" type="xs:string" use="optional">
-					<xs:annotation>
-						<xs:documentation>Code indicating the contents of the image. E.g. GFC, T88</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="cachePath" use="optional">
-					<xs:simpleType>
-						<xs:restriction base="xs:string">
-							<xs:maxLength value="255"/>
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:attribute>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="imageResourceSeries">
-		<xs:complexContent>
-			<xs:extension base="xnat:resourceSeries">
-				<xs:sequence>
-					<xs:element name="dimensions" minOccurs="0">
-						<xs:complexType>
-							<xs:attribute name="x" type="xs:integer"/>
-							<xs:attribute name="y" type="xs:integer"/>
-							<xs:attribute name="z" type="xs:integer"/>
-							<xs:attribute name="volumes" type="xs:integer"/>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="voxelRes" minOccurs="0">
-						<xs:complexType>
-							<xs:attribute name="x" type="xs:float"/>
-							<xs:attribute name="y" type="xs:float"/>
-							<xs:attribute name="z" type="xs:float"/>
-							<xs:attribute name="units" type="xs:string"/>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="orientation" minOccurs="0">
-						<xs:simpleType>
-							<xs:restriction base="xs:string"/>
-						</xs:simpleType>
-					</xs:element>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="dicomSeries">
-		<xs:complexContent>
-			<xs:extension base="xnat:abstractResource">
-				<xs:sequence>
-					<xs:element name="dimensions" minOccurs="0">
-						<xs:complexType>
-							<xs:attribute name="x" type="xs:integer"/>
-							<xs:attribute name="y" type="xs:integer"/>
-							<xs:attribute name="z" type="xs:integer"/>
-							<xs:attribute name="volumes" type="xs:integer"/>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="voxelRes" minOccurs="0">
-						<xs:complexType>
-							<xs:attribute name="x" type="xs:float"/>
-							<xs:attribute name="y" type="xs:float"/>
-							<xs:attribute name="z" type="xs:float"/>
-							<xs:attribute name="units" type="xs:string"/>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="orientation" minOccurs="0">
-						<xs:simpleType>
-							<xs:restriction base="xs:string"/>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element name="imageSet">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="image" maxOccurs="unbounded">
-									<xs:complexType>
-										<xs:attribute name="URI" use="required">
-											<xs:simpleType>
-												<xs:restriction base="xs:anyURI">
-													<xs:maxLength value="255"/>
-												</xs:restriction>
-											</xs:simpleType>
-										</xs:attribute>
-										<xs:attribute name="sop_instance_UID" type="xs:string" use="required">
-											<xs:annotation>
-												<xs:appinfo>
-													<xdat:field unique="true"/>
-												</xs:appinfo>
-											</xs:annotation>
-										</xs:attribute>
-										<xs:attribute name="instance_number" type="xs:integer" use="optional"/>
-									</xs:complexType>
-								</xs:element>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-				<xs:attribute name="format" type="xs:string" use="optional">
-					<xs:annotation>
-						<xs:documentation>Format of file. E.g. DICOM, Analyze, 4dfp</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="description" type="xs:string" use="optional">
-					<xs:annotation>
-						<xs:documentation>Free-form comments about files</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="content" type="xs:string" use="optional">
-					<xs:annotation>
-						<xs:documentation>Code indicating the contents of the image. E.g. GFC, T88</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="cachePath" use="optional">
-					<xs:simpleType>
-						<xs:restriction base="xs:string">
-							<xs:maxLength value="255"/>
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:attribute>
-				<xs:attribute name="UID" type="xs:string" use="required">
-					<xs:annotation>
-						<xs:appinfo>
-							<xdat:field unique="true"/>
-						</xs:appinfo>
-					</xs:annotation>
-				</xs:attribute>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="publicationResource">
-		<xs:complexContent>
-			<xs:extension base="xnat:abstractResource">
-				<xs:sequence minOccurs="0">
-					<xs:element name="title" minOccurs="0">
-						<xs:annotation>
-							<xs:appinfo>
-								<xdat:field unique="true"/>
-							</xs:appinfo>
-						</xs:annotation>
-						<xs:simpleType>
-							<xs:restriction base="xs:string">
-								<xs:maxLength value="1000"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element name="citation" minOccurs="0">
-						<xs:simpleType>
-							<xs:restriction base="xs:string">
-								<xs:maxLength value="1000"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element name="abstract" minOccurs="0">
-						<xs:simpleType>
-							<xs:restriction base="xs:string">
-								<xs:maxLength value="10000"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element name="commentary" minOccurs="0">
-						<xs:simpleType>
-							<xs:restriction base="xs:string">
-								<xs:maxLength value="10000"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-				</xs:sequence>
-				<xs:attribute name="isPrimary" type="xs:boolean" use="optional"/>
-				<xs:attribute name="doi" type="xs:string" use="optional">
-					<xs:annotation>
-						<xs:appinfo>
-							<xdat:field unique="true"/>
-						</xs:appinfo>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="pubmed" type="xs:string" use="optional">
-					<xs:annotation>
-						<xs:appinfo>
-							<xdat:field unique="true"/>
-						</xs:appinfo>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="medline" type="xs:string" use="optional">
-					<xs:annotation>
-						<xs:appinfo>
-							<xdat:field unique="true"/>
-						</xs:appinfo>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="uri" type="xs:anyURI" use="optional">
-					<xs:annotation>
-						<xs:appinfo>
-							<xdat:field unique="true"/>
-						</xs:appinfo>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="other" type="xs:string" use="optional"/>
-				<xs:attribute name="type" type="xs:string" use="optional"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="abstractProtocol">
-		<xs:annotation>
-			<xs:appinfo>
-				<xdat:element displayIdentifiers="ID"/>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:attribute name="ID" type="xs:string" use="required">
-			<xs:annotation>
-				<xs:appinfo>
-					<xdat:field unique="true"/>
-				</xs:appinfo>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="name" type="xs:string" use="optional"/>
-		<xs:attribute name="description" use="optional">
-			<xs:simpleType>
-				<xs:restriction base="xs:string">
-					<xs:maxLength value="10000"/>
-				</xs:restriction>
-			</xs:simpleType>
-		</xs:attribute>
-		<xs:attribute name="data-type" type="xs:string" use="optional"/>
-	</xs:complexType>
-	<xs:complexType name="studyProtocol">
-		<xs:complexContent>
-			<xs:extension base="xnat:abstractProtocol">
-				<xs:sequence>
-					<xs:element name="acqConditions" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="condition" minOccurs="0" maxOccurs="unbounded">
-									<xs:annotation>
-										<xs:appinfo>
-											<xdat:field>
-												<xdat:relation uniqueComposite="FK_ID,FK_NAME"/>
-											</xdat:field>
-										</xs:appinfo>
-									</xs:annotation>
-									<xs:complexType>
-										<xs:attribute name="ID" type="xs:string">
-											<xs:annotation>
-												<xs:appinfo>
-													<xdat:field uniqueComposite="FK_ID"/>
-												</xs:appinfo>
-											</xs:annotation>
-										</xs:attribute>
-										<xs:attribute name="name" type="xs:string">
-											<xs:annotation>
-												<xs:appinfo>
-													<xdat:field uniqueComposite="FK_NAME"/>
-												</xs:appinfo>
-											</xs:annotation>
-										</xs:attribute>
-										<xs:attribute name="description" type="xs:string" use="optional"/>
-									</xs:complexType>
-								</xs:element>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="subjectGroups" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="group" minOccurs="0" maxOccurs="unbounded">
-									<xs:annotation>
-										<xs:appinfo>
-											<xdat:field>
-												<xdat:relation uniqueComposite="FK_ID,FK_NAME"/>
-											</xdat:field>
-										</xs:appinfo>
-									</xs:annotation>
-									<xs:complexType>
-										<xs:attribute name="ID" type="xs:string">
-											<xs:annotation>
-												<xs:appinfo>
-													<xdat:field uniqueComposite="FK_ID"/>
-												</xs:appinfo>
-											</xs:annotation>
-										</xs:attribute>
-										<xs:attribute name="name" type="xs:string">
-											<xs:annotation>
-												<xs:appinfo>
-													<xdat:field uniqueComposite="FK_NAME"/>
-												</xs:appinfo>
-											</xs:annotation>
-										</xs:attribute>
-										<xs:attribute name="description" type="xs:string" use="optional"/>
-									</xs:complexType>
-								</xs:element>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="subjectVariables" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="variable" minOccurs="0" maxOccurs="unbounded">
-									<xs:annotation>
-										<xs:appinfo>
-											<xdat:field>
-												<xdat:relation uniqueComposite="FK_ID,FK_NAME"/>
-											</xdat:field>
-										</xs:appinfo>
-									</xs:annotation>
-									<xs:complexType>
-										<xs:attribute name="ID" type="xs:string">
-											<xs:annotation>
-												<xs:appinfo>
-													<xdat:field uniqueComposite="FK_ID"/>
-												</xs:appinfo>
-											</xs:annotation>
-										</xs:attribute>
-										<xs:attribute name="name" type="xs:string">
-											<xs:annotation>
-												<xs:appinfo>
-													<xdat:field uniqueComposite="FK_NAME"/>
-												</xs:appinfo>
-											</xs:annotation>
-										</xs:attribute>
-										<xs:attribute name="description" type="xs:string" use="optional"/>
-									</xs:complexType>
-								</xs:element>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="imageSessionTypes" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="session" minOccurs="0" maxOccurs="unbounded">
-									<xs:annotation>
-										<xs:appinfo>
-											<xdat:field>
-												<xdat:relation uniqueComposite="FK_ID,FK_NAME"/>
-											</xdat:field>
-										</xs:appinfo>
-									</xs:annotation>
-									<xs:complexType>
-										<xs:attribute name="ID" type="xs:string">
-											<xs:annotation>
-												<xs:appinfo>
-													<xdat:field uniqueComposite="FK_ID"/>
-												</xs:appinfo>
-											</xs:annotation>
-										</xs:attribute>
-										<xs:attribute name="name" type="xs:string">
-											<xs:annotation>
-												<xs:appinfo>
-													<xdat:field uniqueComposite="FK_NAME"/>
-												</xs:appinfo>
-											</xs:annotation>
-										</xs:attribute>
-										<xs:attribute name="description" type="xs:string" use="optional"/>
-									</xs:complexType>
-								</xs:element>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- DEPRECATED: This data type is deprecated. You should only extend from imageAssessorData directly. -->
-	<xs:complexType name="petAssessorData">
-		<xs:annotation>
-			<xs:documentation>A processing event in which primary or derived PET data is analyzed</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageAssessorData"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="petSessionData">
-		<xs:annotation>
-			<xs:documentation>An event in which PET scans are obtained on a subject</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageSessionData">
-				<xs:sequence minOccurs="0">
-					<xs:element name="stabilization" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Free form text to indicate method used to stabilize head</xs:documentation>
-						</xs:annotation>
-						<xs:simpleType>
-							<xs:restriction base="xs:string">
-								<xs:maxLength value="255"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element name="studyType" type="xs:string" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Study descriptor</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="patientID" type="xs:string" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Patient identification descriptor</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="patientName" type="xs:string" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Patient name (free format ASCII)</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="tracer" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Radio-Pharmaceutical</xs:documentation>
-						</xs:annotation>
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="dose" minOccurs="0">
-									<xs:complexType>
-										<xs:simpleContent>
-											<xs:extension base="xs:float">
-												<xs:attribute name="units" type="xs:string" use="optional"/>
-											</xs:extension>
-										</xs:simpleContent>
-									</xs:complexType>
-								</xs:element>
-								<xs:element name="specificActivity" type="xs:float" minOccurs="0"/>
-								<xs:element name="totalMass" minOccurs="0">
-									<xs:complexType>
-										<xs:simpleContent>
-											<xs:extension base="xs:float">
-												<xs:attribute name="units" type="xs:string" use="optional"/>
-											</xs:extension>
-										</xs:simpleContent>
-									</xs:complexType>
-								</xs:element>
-								<xs:element name="intermediate" minOccurs="0">
-									<xs:complexType>
-										<xs:simpleContent>
-											<xs:extension base="xs:float">
-												<xs:attribute name="units" type="xs:string" use="optional"/>
-											</xs:extension>
-										</xs:simpleContent>
-									</xs:complexType>
-								</xs:element>
-								<xs:element name="isotope" minOccurs="0">
-									<xs:complexType>
-										<xs:simpleContent>
-											<xs:extension base="xs:string">
-												<xs:attribute name="half-life" type="xs:float" use="optional">
-													<xs:annotation>
-														<xs:documentation>half-life in seconds</xs:documentation>
-													</xs:annotation>
-												</xs:attribute>
-											</xs:extension>
-										</xs:simpleContent>
-									</xs:complexType>
-								</xs:element>
-								<xs:element name="transmissions" type="xs:integer" minOccurs="0"/>
-								<xs:element name="transmissions_starttime" type="xs:dateTime" minOccurs="0"/>
-							</xs:sequence>
-							<xs:attribute name="name" type="xs:string"/>
-							<xs:attribute name="startTime" type="xs:dateTime" use="optional"/>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="start_time" type="xs:dateTime" minOccurs="0"/>
-					<xs:element name="start_time_scan" type="xs:dateTime" minOccurs="0"/>
-					<xs:element name="start_time_injection" type="xs:dateTime" minOccurs="0"/>
-					<xs:element name="blood_glucose" type="xs:float" minOccurs="0"/>
-					<xs:element name="blood_glucose_units" type="xs:string" minOccurs="0"/>
-					<xs:element name="blood_glucose_time" type="xs:dateTime" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="petmrSessionData">
-		<xs:annotation>
-			<xs:documentation>An event in which scans are obtained by a device capable of both PET and MR acquisitions</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageSessionData">
-				<xs:sequence minOccurs="0">
-					<xs:element name="coil" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Free form text to indicate the coil used in this scanning session</xs:documentation>
-						</xs:annotation>
-						<xs:simpleType>
-							<xs:restriction base="xs:string">
-								<xs:maxLength value="255"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element name="fieldStrength" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Free form text to indicate the field strength used in this scanning session</xs:documentation>
-						</xs:annotation>
-						<xs:simpleType>
-							<xs:restriction base="xs:string">
-								<xs:maxLength value="255"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element name="marker" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Free form text to indicate method used to mark left-right (e.g. Vitamin E capsule)</xs:documentation>
-						</xs:annotation>
-						<xs:simpleType>
-							<xs:restriction base="xs:string">
-								<xs:maxLength value="255"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element name="stabilization" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Free form text to indicate method used to stabilize head</xs:documentation>
-						</xs:annotation>
-						<xs:simpleType>
-							<xs:restriction base="xs:string">
-								<xs:maxLength value="255"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element name="studyType" type="xs:string" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Study descriptor</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="patientID" type="xs:string" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Patient identification descriptor</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="patientName" type="xs:string" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Patient name (free format ASCII)</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="tracer" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Radio-Pharmaceutical</xs:documentation>
-						</xs:annotation>
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="dose" minOccurs="0">
-									<xs:complexType>
-										<xs:simpleContent>
-											<xs:extension base="xs:float">
-												<xs:attribute name="units" type="xs:string" use="optional"/>
-											</xs:extension>
-										</xs:simpleContent>
-									</xs:complexType>
-								</xs:element>
-								<xs:element name="specificActivity" type="xs:float" minOccurs="0"/>
-								<xs:element name="totalMass" minOccurs="0">
-									<xs:complexType>
-										<xs:simpleContent>
-											<xs:extension base="xs:float">
-												<xs:attribute name="units" type="xs:string" use="optional"/>
-											</xs:extension>
-										</xs:simpleContent>
-									</xs:complexType>
-								</xs:element>
-								<xs:element name="intermediate" minOccurs="0">
-									<xs:complexType>
-										<xs:simpleContent>
-											<xs:extension base="xs:float">
-												<xs:attribute name="units" type="xs:string" use="optional"/>
-											</xs:extension>
-										</xs:simpleContent>
-									</xs:complexType>
-								</xs:element>
-								<xs:element name="isotope" minOccurs="0">
-									<xs:complexType>
-										<xs:simpleContent>
-											<xs:extension base="xs:string">
-												<xs:attribute name="half-life" type="xs:float" use="optional">
-													<xs:annotation>
-														<xs:documentation>half-life in seconds</xs:documentation>
-													</xs:annotation>
-												</xs:attribute>
-											</xs:extension>
-										</xs:simpleContent>
-									</xs:complexType>
-								</xs:element>
-								<xs:element name="transmissions" type="xs:integer" minOccurs="0"/>
-								<xs:element name="transmissions_starttime" type="xs:dateTime" minOccurs="0"/>
-							</xs:sequence>
-							<xs:attribute name="name" type="xs:string"/>
-							<xs:attribute name="startTime" type="xs:dateTime" use="optional"/>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="start_time" type="xs:dateTime" minOccurs="0"/>
-					<xs:element name="start_time_scan" type="xs:dateTime" minOccurs="0"/>
-					<xs:element name="start_time_injection" type="xs:dateTime" minOccurs="0"/>
-					<xs:element name="blood_glucose" type="xs:float" minOccurs="0"/>
-					<xs:element name="blood_glucose_units" type="xs:string" minOccurs="0"/>
-					<xs:element name="blood_glucose_time" type="xs:dateTime" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	
-	<xs:complexType name="petScanData">
-		<xs:annotation>
-			<xs:documentation>Information about an individual PET scan sequence</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageScanData">
-				<xs:sequence minOccurs="0">
-					<xs:element name="parameters" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="orientation" type="xs:integer" minOccurs="0"/>
-								<xs:element name="addParam" type="xnat:addField" minOccurs="0" maxOccurs="unbounded">
-									<xs:annotation>
-										<xs:appinfo>
-											<xdat:field>
-												<xdat:relation uniqueComposite="PET_SCAN"/>
-											</xdat:field>
-										</xs:appinfo>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="originalFileName" type="xs:string" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>Scan file creation name</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="systemType" type="xs:integer" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>Scanner model (i.e., 951, 951R, 953, 953B, 921,
-922, 925, 961, 962, 966)</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="fileType" type="xs:integer" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>Enumerated type (00=unknown, 01=Sinogram,
-02=Image-16, 03=Attenuation Correction,
-04=Normalization, 05=Polar Map, 06=Volume 8,
-07=Volume 16, 08=Projection 8, 09=Projection
-16, 10=Image 8, 11=3D Sinogram 16, 12=3D
-Sinogram 8, 13=3D Normalization, 14=3D
-Sinogram Fit)</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="transaxialFOV" type="xs:float" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>Diameter (in cm.) of transaxial view</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="acqType" type="xs:integer" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>Enumerated type (0=Undefined, 1=Blank,
-2=Transmission, 3=Static emission, 4=Dynamic
-emission, 5=Gated emission, 6=Transmission
-rectilinear, 7=Emission rectilinear)</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="facility" type="xs:string" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation/>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="numPlanes" type="xs:integer" minOccurs="0"/>
-								<xs:element name="frames" minOccurs="0">
-									<xs:complexType>
-										<xs:sequence minOccurs="0">
-											<xs:element name="frame" minOccurs="0" maxOccurs="unbounded">
-												<xs:annotation>
-													<xs:appinfo>
-														<xdat:element displayIdentifiers="number"/>
-														<xdat:field>
-															<xdat:relation uniqueComposite="true"/>
-														</xdat:field>
-													</xs:appinfo>
-												</xs:annotation>
-												<xs:complexType>
-													<xs:attribute name="number" type="xs:int" use="required">
-														<xs:annotation>
-															<xs:appinfo>
-																<xdat:field uniqueComposite="true"/>
-															</xs:appinfo>
-														</xs:annotation>
-													</xs:attribute>
-													<xs:attribute name="starttime" type="xs:float" use="required"/>
-													<xs:attribute name="length" type="xs:float" use="required"/>
-													<xs:attribute name="units" use="required">
-														<xs:simpleType>
-															<xs:restriction base="xs:string">
-																<xs:enumeration value="sec"/>
-																<xs:enumeration value="min"/>
-															</xs:restriction>
-														</xs:simpleType>
-													</xs:attribute>
-												</xs:complexType>
-											</xs:element>
-										</xs:sequence>
-										<xs:attribute name="numFrames" type="xs:int" use="optional"/>
-									</xs:complexType>
-								</xs:element>
-								<xs:element name="numGates" type="xs:integer" minOccurs="0"/>
-								<xs:element name="planeSeparation" type="xs:float" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>Physical distance between adjacent planes (in
-cm.)</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="binSize" type="xs:float" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>Width of view sample (in cm)</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="dataType" type="xs:integer" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>Enumerated type (0=Unkonwn Matrix Data Type,
-1=Byte Data, 2=VAX_Ix2, 3=VAX_Ix4,
-4=VAX_Rx4, 5=IEEE Float, 6=Sun short, 7=Sun
-long)</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="dimensions" minOccurs="0">
-									<xs:complexType>
-										<xs:attribute name="x" type="xs:integer" use="optional">
-											<xs:annotation>
-												<xs:documentation>Dimension along x axis</xs:documentation>
-											</xs:annotation>
-										</xs:attribute>
-										<xs:attribute name="y" type="xs:integer" use="optional">
-											<xs:annotation>
-												<xs:documentation>Dimension along y axis</xs:documentation>
-											</xs:annotation>
-										</xs:attribute>
-										<xs:attribute name="z" type="xs:integer" use="optional">
-											<xs:annotation>
-												<xs:documentation>Dimension along z axis</xs:documentation>
-											</xs:annotation>
-										</xs:attribute>
-										<xs:attribute name="num" type="xs:integer" use="optional">
-											<xs:annotation>
-												<xs:documentation>Number of dimensions</xs:documentation>
-											</xs:annotation>
-										</xs:attribute>
-									</xs:complexType>
-								</xs:element>
-								<xs:element name="offset" minOccurs="0">
-									<xs:complexType>
-										<xs:attribute name="x" type="xs:float" use="optional">
-											<xs:annotation>
-												<xs:documentation>Offset in x axis for recon target (in cm)</xs:documentation>
-											</xs:annotation>
-										</xs:attribute>
-										<xs:attribute name="y" type="xs:float" use="optional">
-											<xs:annotation>
-												<xs:documentation>Offset in y axis for recon target (in cm)</xs:documentation>
-											</xs:annotation>
-										</xs:attribute>
-										<xs:attribute name="z" type="xs:float" use="optional">
-											<xs:annotation>
-												<xs:documentation>Offset in z axis for recon target (in cm)</xs:documentation>
-											</xs:annotation>
-										</xs:attribute>
-									</xs:complexType>
-								</xs:element>
-								<xs:element name="reconZoom" type="xs:float" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>Reconstruction magnification factor (zoom)</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="pixelSize" minOccurs="0">
-									<xs:complexType>
-										<xs:attribute name="x" type="xs:float" use="optional">
-											<xs:annotation>
-												<xs:documentation>X dimension pixel size (in cm)</xs:documentation>
-											</xs:annotation>
-										</xs:attribute>
-										<xs:attribute name="y" type="xs:float" use="optional">
-											<xs:annotation>
-												<xs:documentation>Y dimension pixel size (in cm)</xs:documentation>
-											</xs:annotation>
-										</xs:attribute>
-										<xs:attribute name="z" type="xs:float" use="optional">
-											<xs:annotation>
-												<xs:documentation>Z dimension pixel size (in cm)</xs:documentation>
-											</xs:annotation>
-										</xs:attribute>
-									</xs:complexType>
-								</xs:element>
-								<xs:element name="filterCode" type="xs:integer" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>Enumerated type (0=all pass, 1=ramp,
-2=Butterworth, 3=Hanning,
-4=Hamming,5=Parzen, 6=Shepp,
-7=Butterworth-order 2, 8=Gaussian,
-9=Median,10=Boxcar)</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="resolution" minOccurs="0">
-									<xs:complexType>
-										<xs:attribute name="x" type="xs:float" use="optional">
-											<xs:annotation>
-												<xs:documentation>Resolution in the x dimension (in cm)</xs:documentation>
-											</xs:annotation>
-										</xs:attribute>
-										<xs:attribute name="y" type="xs:float" use="optional">
-											<xs:annotation>
-												<xs:documentation>Resolution in the y dimension (in cm)</xs:documentation>
-											</xs:annotation>
-										</xs:attribute>
-										<xs:attribute name="z" type="xs:float" use="optional">
-											<xs:annotation>
-												<xs:documentation>Resolution in the z dimension (in cm)</xs:documentation>
-											</xs:annotation>
-										</xs:attribute>
-									</xs:complexType>
-								</xs:element>
-								<xs:element name="numRElements" type="xs:float" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>Number R elements from sinogram</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="numAngles" type="xs:float" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>Number of angles from sinogram</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="ZRotationAngle" type="xs:float" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>Rotation in the xy plane (in degrees). Use righthand
-coordinate system for rotation angle sign.</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="processingCode" type="xs:integer" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>Bit mask (0=Not Processed, 1=Normalized,
-2=Measured Attenuation Correction,
-4=Calculated Attenuation Correction, 8=X
-smoothing, 16=Y smoothing, 32=Z smoothing,
-64=2D scatter correction, 128=3D scatter
-correction, 256=Arc correction, 512=Decay
-correction, 1024=Online compression)</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="gateDuration" type="xs:integer" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>Gate duration (in msec)</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="rWaveOffset" type="xs:integer" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>R wave offset (For phase sliced studies, average,
-in msec)</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="numAcceptedBeats" type="xs:integer" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>Number of accepted beats for this gate</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="filter" minOccurs="0">
-									<xs:complexType>
-										<xs:attribute name="cutoff" type="xs:float" use="optional">
-											<xs:annotation>
-												<xs:documentation>Cutoff frequency</xs:documentation>
-											</xs:annotation>
-										</xs:attribute>
-									</xs:complexType>
-								</xs:element>
-								<xs:element name="annotation" type="xs:string" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation/>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="MT_1_1" type="xs:float" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>Matrix transformation element (1,1).</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="MT_1_2" type="xs:float" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>Matrix transformation element (1,2).</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="MT_1_3" type="xs:float" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>Matrix transformation element (1,3).</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="MT_1_4" type="xs:float" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>Matrix transformation element (1,4).</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="MT_2_1" type="xs:float" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>Matrix transformation element (2,1).</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="MT_2_2" type="xs:float" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>Matrix transformation element (2,2).</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="MT_2_3" type="xs:float" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>Matrix transformation element (2,3).</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="MT_2_4" type="xs:float" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>Matrix transformation element (2,4).</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="MT_3_1" type="xs:float" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>Matrix transformation element (3,1).</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="MT_3_2" type="xs:float" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>Matrix transformation element (3,2).</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="MT_3_3" type="xs:float" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>Matrix transformation element (3,3).</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="MT_3_4" type="xs:float" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>Matrix transformation element (3,4).</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="RFilter" minOccurs="0">
-									<xs:complexType>
-										<xs:attribute name="cutoff" type="xs:float" use="optional">
-											<xs:annotation>
-												<xs:documentation/>
-											</xs:annotation>
-										</xs:attribute>
-										<xs:attribute name="resolution" type="xs:float" use="optional">
-											<xs:annotation>
-												<xs:documentation/>
-											</xs:annotation>
-										</xs:attribute>
-										<xs:attribute name="code" type="xs:integer" use="optional">
-											<xs:annotation>
-												<xs:documentation/>
-											</xs:annotation>
-										</xs:attribute>
-										<xs:attribute name="order" type="xs:integer" use="optional">
-											<xs:annotation>
-												<xs:documentation/>
-											</xs:annotation>
-										</xs:attribute>
-									</xs:complexType>
-								</xs:element>
-								<xs:element name="ZFilter" minOccurs="0">
-									<xs:complexType>
-										<xs:attribute name="cutoff" type="xs:float" use="optional">
-											<xs:annotation>
-												<xs:documentation/>
-											</xs:annotation>
-										</xs:attribute>
-										<xs:attribute name="resolution" type="xs:float" use="optional">
-											<xs:annotation>
-												<xs:documentation/>
-											</xs:annotation>
-										</xs:attribute>
-										<xs:attribute name="code" type="xs:integer" use="optional">
-											<xs:annotation>
-												<xs:documentation/>
-											</xs:annotation>
-										</xs:attribute>
-										<xs:attribute name="order" type="xs:integer" use="optional">
-											<xs:annotation>
-												<xs:documentation/>
-											</xs:annotation>
-										</xs:attribute>
-									</xs:complexType>
-								</xs:element>
-								<xs:element name="scatterType" type="xs:integer" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>Enumerated type (0=None, 1=Deconvolution,
-2=Simulated, 3=Dual Energy)</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="reconType" type="xs:integer" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>Enumerated type (0=Filtered backprojection,
-1=Forward projection 3D (PROMIS), 2=Ramp
-3D, 3=FAVOR 3D, 4=SSRB, 5=Multi-slice
-rebinning, 6=FORE)</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="reconViews" type="xs:integer" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>Number of views used to reconstruct the data</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="bedPosition" type="xs:float" minOccurs="0"/>
-								<xs:element name="ecatCalibrationFactor" type="xs:float" minOccurs="0"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="ecatValidation" minOccurs="0">
-						<xs:complexType>
-							<xs:simpleContent>
-								<xs:extension base="xs:string">
-									<xs:attribute name="status" type="xs:boolean" use="optional"/>
-								</xs:extension>
-							</xs:simpleContent>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="computationData">
-		<xs:attribute name="name" type="xs:string" use="required">
-			<xs:annotation>
-				<xs:appinfo>
-					<xdat:field uniqueComposite="PET_RECON"/>
-				</xs:appinfo>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="value" type="xs:string" use="required"/>
-		<xs:attribute name="source" type="xs:string" use="required">
-			<xs:annotation>
-				<xs:appinfo>
-					<xdat:field uniqueComposite="PET_RECON"/>
-				</xs:appinfo>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="units" type="xs:string" use="optional"/>
-	</xs:complexType>
-	<xs:complexType name="regionResource">
-		<xs:sequence>
-			<xs:element name="file" type="xnat:abstractResource">
-				<xs:annotation>
-					<xs:documentation>details of the region file</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="baseimage" type="xnat:abstractResource">
-				<xs:annotation>
-					<xs:documentation>the details of the file against which this region was created</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="creator">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="firstname" type="xs:string">
-							<xs:annotation>
-								<xs:appinfo>
-									<xdat:field uniqueComposite="SESSION"/>
-								</xs:appinfo>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="lastname" type="xs:string">
-							<xs:annotation>
-								<xs:appinfo>
-									<xdat:field uniqueComposite="SESSION"/>
-								</xs:appinfo>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="subregionlabels" minOccurs="0">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="label" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:appinfo>
-									<xdat:field>
-										<xdat:relation uniqueComposite="UNIQUE_REGION"/>
-									</xdat:field>
-								</xs:appinfo>
-							</xs:annotation>
-							<xs:complexType>
-								<xs:simpleContent>
-									<xs:extension base="xs:string">
-										<xs:attribute name="id" type="xs:int" use="required">
-											<xs:annotation>
-												<xs:appinfo>
-													<xdat:field uniqueComposite="UNIQUE_REGION"/>
-												</xs:appinfo>
-											</xs:annotation>
-										</xs:attribute>
-										<xs:attribute name="hemisphere" use="required">
-											<xs:simpleType>
-												<xs:restriction base="xs:string">
-													<xs:enumeration value="left"/>
-													<xs:enumeration value="right"/>
-													<xs:enumeration value="both"/>
-												</xs:restriction>
-											</xs:simpleType>
-										</xs:attribute>
-									</xs:extension>
-								</xs:simpleContent>
-							</xs:complexType>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-		</xs:sequence>
-		<xs:attribute name="name" type="xs:string" use="required">
-			<xs:annotation>
-				<xs:documentation>Name of the region eg Brainstem
-</xs:documentation>
-				<xs:appinfo>
-					<xdat:field uniqueComposite="SESSION"/>
-				</xs:appinfo>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="hemisphere" use="required">
-			<xs:annotation>
-				<xs:appinfo>
-					<xdat:field uniqueComposite="SESSION"/>
-				</xs:appinfo>
-			</xs:annotation>
-			<xs:simpleType>
-				<xs:restriction base="xs:string">
-					<xs:enumeration value="left"/>
-					<xs:enumeration value="right"/>
-					<xs:enumeration value="both"/>
-				</xs:restriction>
-			</xs:simpleType>
-		</xs:attribute>
-		<xs:attribute name="session_id" type="xs:string" use="optional">
-			<xs:annotation>
-				<xs:appinfo>
-					<xdat:field baseElement="xnat:imageSessionData" baseCol="ID" uniqueComposite="SESSION"/>
-				</xs:appinfo>
-			</xs:annotation>
-		</xs:attribute>
-	</xs:complexType>
-	<xs:complexType name="resourceCatalog">
-		<xs:complexContent>
-			<xs:extension base="xnat:resource"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="statisticsData">
-		<xs:complexContent>
-			<xs:extension base="xnat:abstractStatistics">
-				<xs:sequence>
-					<xs:element name="mean" type="xs:double" minOccurs="0"/>
-					<xs:element name="snr" type="xs:double" minOccurs="0"/>
-					<xs:element name="min" type="xs:double" minOccurs="0"/>
-					<xs:element name="max" type="xs:double" minOccurs="0"/>
-					<xs:element name="stddev" type="xs:double" minOccurs="0"/>
-					<xs:element name="no_of_voxels" type="xs:integer" minOccurs="0"/>
-					<xs:element name="additionalStatistics" minOccurs="0" maxOccurs="unbounded">
-						<xs:annotation>
-							<xs:appinfo>
-								<xdat:field>
-									<xdat:relation uniqueComposite="ADD_STAT_NAME"/>
-								</xdat:field>
-							</xs:appinfo>
-						</xs:annotation>
-						<xs:complexType>
-							<xs:simpleContent>
-								<xs:extension base="xs:double">
-									<xs:attribute name="name" type="xs:string" use="optional">
-										<xs:annotation>
-											<xs:appinfo>
-												<xdat:field uniqueComposite="ADD_STAT_NAME"/>
-											</xs:appinfo>
-										</xs:annotation>
-									</xs:attribute>
-								</xs:extension>
-							</xs:simpleContent>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="addField" minOccurs="0" maxOccurs="unbounded">
-						<xs:annotation>
-							<xs:appinfo>
-								<xdat:element displayIdentifiers="name"/>
-								<xdat:field>
-									<xdat:relation uniqueComposite="ADD_FIELD_NAME"/>
-								</xdat:field>
-							</xs:appinfo>
-						</xs:annotation>
-						<xs:complexType>
-							<xs:simpleContent>
-								<xs:extension base="xs:string">
-									<xs:attribute name="name" type="xs:string">
-										<xs:annotation>
-											<xs:appinfo>
-												<xdat:field uniqueComposite="ADD_FIELD_NAME"/>
-											</xs:appinfo>
-										</xs:annotation>
-									</xs:attribute>
-								</xs:extension>
-							</xs:simpleContent>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="abstractStatistics"/>
-	<xs:complexType name="qcAssessmentData">
-		<xs:complexContent>
-			<xs:extension base="xnat:mrAssessorData">
-				<xs:sequence>
-					<xs:element name="scans">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="scan" maxOccurs="unbounded">
-									<xs:annotation>
-										<xs:appinfo>
-											<xdat:field>
-												<xdat:relation uniqueComposite="ASSESSOR_ID"/>
-											</xdat:field>
-										</xs:appinfo>
-									</xs:annotation>
-									<xs:complexType>
-										<xs:sequence>
-											<xs:element name="sliceQC" minOccurs="0">
-												<xs:complexType>
-													<xs:sequence>
-														<xs:element name="slice" maxOccurs="unbounded">
-															<xs:annotation>
-																<xs:appinfo>
-																	<xdat:field>
-																		<xdat:relation uniqueComposite="SLICE_ID"/>
-																	</xdat:field>
-																</xs:appinfo>
-															</xs:annotation>
-															<xs:complexType>
-																<xs:sequence>
-																	<xs:element name="sliceStatistics" type="xnat:abstractStatistics" minOccurs="0"/>
-																</xs:sequence>
-																<xs:attribute name="number" type="xs:string">
-																	<xs:annotation>
-																		<xs:appinfo>
-																			<xdat:field uniqueComposite="SLICE_ID"/>
-																		</xs:appinfo>
-																	</xs:annotation>
-																</xs:attribute>
-															</xs:complexType>
-														</xs:element>
-													</xs:sequence>
-												</xs:complexType>
-											</xs:element>
-											<xs:element name="scanStatistics" type="xnat:abstractStatistics" minOccurs="0"/>
-										</xs:sequence>
-										<xs:attribute name="id" type="xs:string" use="required">
-											<xs:annotation>
-												<xs:appinfo>
-													<xdat:field uniqueComposite="ASSESSOR_ID"/>
-												</xs:appinfo>
-											</xs:annotation>
-										</xs:attribute>
-									</xs:complexType>
-								</xs:element>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-				<xs:attribute name="type" type="xs:string" use="optional"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="datatypeProtocol">
-		<xs:complexContent>
-			<xs:extension base="xnat:abstractProtocol">
-				<xs:sequence minOccurs="0">
-					<xs:element name="definitions" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence minOccurs="0">
-								<xs:element name="definition" type="xnat:fieldDefinitionGroup" minOccurs="0" maxOccurs="unbounded">
-									<xs:annotation>
-										<xs:appinfo>
-											<xdat:field>
-												<xdat:relation relationType="multi" relationName="xnat_datatypeProtocol_fieldGroups"/>
-											</xdat:field>
-										</xs:appinfo>
-									</xs:annotation>
-								</xs:element>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="fieldDefinitionGroup">
-		<xs:sequence minOccurs="0">
-			<xs:element name="fields" minOccurs="0">
-				<xs:complexType>
-					<xs:sequence minOccurs="0">
-						<xs:element name="field" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:appinfo>
-									<xdat:element displayIdentifiers="name"/>
-									<xdat:field>
-										<xdat:relation uniqueComposite="NAME"/>
-									</xdat:field>
-								</xs:appinfo>
-							</xs:annotation>
-							<xs:complexType>
-								<xs:sequence minOccurs="0">
-									<xs:element name="possibleValues" minOccurs="0">
-										<xs:complexType>
-											<xs:sequence minOccurs="0">
-												<xs:element name="possibleValue" minOccurs="0" maxOccurs="unbounded">
-													<xs:annotation>
-														<xs:appinfo>
-															<xdat:field uniqueComposite="pValue">
-																<xdat:relation uniqueComposite="pValue"/>
-															</xdat:field>
-														</xs:appinfo>
-													</xs:annotation>
-													<xs:complexType>
-														<xs:simpleContent>
-															<xs:extension base="xs:string">
-																<xs:attribute name="display" type="xs:string"/>
-															</xs:extension>
-														</xs:simpleContent>
-													</xs:complexType>
-												</xs:element>
-											</xs:sequence>
-										</xs:complexType>
-									</xs:element>
-								</xs:sequence>
-								<xs:attribute name="name" use="required">
-									<xs:annotation>
-										<xs:appinfo>
-											<xdat:field uniqueComposite="NAME"/>
-										</xs:appinfo>
-									</xs:annotation>
-									<xs:simpleType>
-										<xs:restriction base="xs:string">
-											<xs:maxLength value="10000"/>
-										</xs:restriction>
-									</xs:simpleType>
-								</xs:attribute>
-								<xs:attribute name="type" use="optional" default="standard">
-									<xs:simpleType>
-										<xs:restriction base="xs:string">
-											<xs:enumeration value="standard"/>
-											<xs:enumeration value="custom"/>
-										</xs:restriction>
-									</xs:simpleType>
-								</xs:attribute>
-								<xs:attribute name="datatype" use="optional">
-									<xs:simpleType>
-										<xs:restriction base="xs:string">
-											<xs:enumeration value="integer"/>
-											<xs:enumeration value="float"/>
-											<xs:enumeration value="boolean"/>
-											<xs:enumeration value="string"/>
-											<xs:enumeration value="date"/>
-										</xs:restriction>
-									</xs:simpleType>
-								</xs:attribute>
-								<xs:attribute name="required" type="xs:boolean" use="optional" default="false"/>
-								<xs:attribute name="sequence" type="xs:integer" use="optional"/>
-								<xs:attribute name="xmlPath" use="optional">
-									<xs:simpleType>
-										<xs:restriction base="xs:string">
-											<xs:maxLength value="1000"/>
-										</xs:restriction>
-									</xs:simpleType>
-								</xs:attribute>
-								<xs:attribute name="group" type="xs:string" use="optional">
-									<xs:annotation>
-										<xs:appinfo>
-											<xdat:field>
-												<xdat:sqlField name="_group"/>
-											</xdat:field>
-										</xs:appinfo>
-									</xs:annotation>
-								</xs:attribute>
-							</xs:complexType>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-		</xs:sequence>
-		<xs:attribute name="ID" type="xs:string">
-			<xs:annotation>
-				<xs:appinfo>
-					<xdat:field uniqueComposite="true"/>
-				</xs:appinfo>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="data-type" type="xs:string">
-			<xs:annotation>
-				<xs:appinfo>
-					<xdat:field uniqueComposite="true"/>
-				</xs:appinfo>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="description">
-			<xs:simpleType>
-				<xs:restriction base="xs:string">
-					<xs:maxLength value="10000"/>
-				</xs:restriction>
-			</xs:simpleType>
-		</xs:attribute>
-		<xs:attribute name="shareable" type="xs:boolean"/>
-		<xs:attribute name="project-specific" type="xs:boolean"/>
-	</xs:complexType>
-	<xs:complexType name="contrastBolus">
-		<xs:annotation>
-			<xs:documentation>Description of contrast/bolus used for image acquisition</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="agent" type="xs:string" minOccurs="0"/>
-			<xs:element name="route" type="xs:string" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Administration route</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="volume" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Total amount of diluted agent (in ml)</xs:documentation>
-				</xs:annotation>
-				<xs:simpleType>
-					<xs:restriction base="xs:float">
-						<xs:minInclusive value="0"/>
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:element>
-			<xs:element name="totalDose" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Total amount of undiluted agent (in ml)</xs:documentation>
-				</xs:annotation>
-				<xs:simpleType>
-					<xs:restriction base="xs:float">
-						<xs:minInclusive value="0"/>
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:element>
-			<xs:element name="flowRate" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>In ml/s</xs:documentation>
-				</xs:annotation>
-				<xs:simpleType>
-					<xs:restriction base="xs:float">
-						<xs:minInclusive value="0"/>
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:element>
-			<xs:element name="flowDuration" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>In s</xs:documentation>
-				</xs:annotation>
-				<xs:simpleType>
-					<xs:restriction base="xs:float">
-						<xs:minInclusive value="0"/>
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:element>
-			<xs:element name="activeIngredient" type="xs:string" minOccurs="0"/>
-			<xs:element name="concentration" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Concentration of active ingredient in diluted agent, in mg/ml</xs:documentation>
-				</xs:annotation>
-				<xs:simpleType>
-					<xs:restriction base="xs:float">
-						<xs:minInclusive value="0"/>
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="imageAssessorData">
-		<xs:annotation>
-			<xs:documentation>A processing event in which primary or derived image data is analyzed</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:derivedData">
-				<xs:sequence>
-					<xs:element name="in" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence minOccurs="0">
-								<xs:element name="file" type="xnat:abstractResource" minOccurs="0" maxOccurs="unbounded">
-									<xs:annotation>
-										<xs:appinfo>
-											<xdat:field displayName="in resource">
-												<xdat:relation relationType="multi" relationName="img_assessor_in_resource"/>
-											</xdat:field>
-										</xs:appinfo>
-									</xs:annotation>
-								</xs:element>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="out" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence minOccurs="0">
-								<xs:element name="file" type="xnat:abstractResource" minOccurs="0" maxOccurs="unbounded">
-									<xs:annotation>
-										<xs:appinfo>
-											<xdat:field displayName="out resource">
-												<xdat:relation relationType="multi" relationName="img_assessor_out_resource"/>
-											</xdat:field>
-										</xs:appinfo>
-									</xs:annotation>
-								</xs:element>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="imageSession_ID" type="xs:string">
-						<xs:annotation>
-							<xs:appinfo>
-								<xdat:field baseElement="xnat:imageSessionData" baseCol="ID"/>
-							</xs:appinfo>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="parameters" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="addParam" type="xnat:addField" minOccurs="0" maxOccurs="unbounded">
-									<xs:annotation>
-										<xs:appinfo>
-											<xdat:field>
-												<xdat:relation uniqueComposite="ASSESSOR"/>
-											</xdat:field>
-										</xs:appinfo>
-									</xs:annotation>
-								</xs:element>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="imageScanData">
-		<xs:annotation>
-			<xs:appinfo>
-				<xdat:element displayIdentifiers="ID"/>
-			</xs:appinfo>
-			<xs:documentation>Information about an individual image scan sequence</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="sharing" minOccurs="0">
-				<xs:complexType>
-					<xs:sequence minOccurs="0">
-						<xs:element name="share" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:appinfo>
-									<xdat:field>
-										<xdat:relation uniqueComposite="PROJECT_SCAN"/>
-									</xdat:field>
-								</xs:appinfo>
-							</xs:annotation>
-							<xs:complexType>
-								<xs:simpleContent>
-									<xs:extension base="xs:string">
-										<xs:attribute name="label" type="xs:string" use="optional"/>
-										<xs:attribute name="project" type="xs:string" use="optional">
-											<xs:annotation>
-												<xs:appinfo>
-													<xdat:field baseElement="xnat:projectData" baseCol="ID" uniqueComposite="PROJECT_SCAN"/>
-												</xs:appinfo>
-											</xs:annotation>
-										</xs:attribute>
-									</xs:extension>
-								</xs:simpleContent>
-							</xs:complexType>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="image_session_ID" type="xs:string" minOccurs="0">
-				<xs:annotation>
-					<xs:appinfo>
-						<xdat:field baseElement="xnat:imageSessionData" baseCol="ID" uniqueComposite="mr_id_fk"/>
-					</xs:appinfo>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="note" type="xs:string" minOccurs="0"/>
-			<xs:element name="quality" type="xs:string" minOccurs="0"/>
-			<xs:element name="condition" type="xs:string" minOccurs="0"/>
-			<xs:element name="series_description" type="xs:string" minOccurs="0"/>
-			<xs:element name="documentation" minOccurs="0">
-				<xs:simpleType>
-					<xs:restriction base="xs:string">
-						<xs:maxLength value="1000"/>
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:element>
-			<xs:element name="scanner" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Free form text to indicate name/ID of scanner</xs:documentation>
-				</xs:annotation>
-				<xs:complexType>
-					<xs:simpleContent>
-						<xs:extension base="xs:string">
-							<xs:attribute name="manufacturer" type="xs:string" use="optional"/>
-							<xs:attribute name="model" type="xs:string" use="optional"/>
-						</xs:extension>
-					</xs:simpleContent>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="modality" type="xs:string" minOccurs="0"/>
-			<xs:element name="frames" type="xs:integer" minOccurs="0"/>
-			<xs:element name="operator" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Free form text to indicate individuals who operated scanner</xs:documentation>
-				</xs:annotation>
-				<xs:simpleType>
-					<xs:restriction base="xs:string">
-						<xs:maxLength value="255"/>
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:element>
-			<xs:element name="file" type="xnat:abstractResource" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:appinfo>
-						<xdat:field displayName="resource"/>
-					</xs:appinfo>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="validation" type="xnat:validationData" minOccurs="0"/>
-			<xs:element name="startTime" type="xs:time" minOccurs="0">
-			        <xs:annotation>
-				        <xs:documentation>Time the scan started</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-		<xs:attribute name="ID" type="xs:string" use="required">
-			<xs:annotation>
-				<xs:appinfo>
-					<xdat:field uniqueComposite="mr_id_fk"/>
-				</xs:appinfo>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="type" type="xs:string" use="optional"/>
-		<xs:attribute name="UID" type="xs:string" use="optional">
-			<xs:annotation>
-				<xs:documentation>DICOM Series Instance UID (0020,000E)</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="project" type="xs:string" use="optional"/>
-	</xs:complexType>
-	<xs:complexType name="ctSessionData">
-		<xs:annotation>
-			<xs:documentation>An event in which CT scans are obtained on a subject</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageSessionData"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="ctScanData">
-		<xs:annotation>
-			<xs:documentation>An individual CT scan sequence</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageScanData">
-				<xs:sequence>
-					<xs:element name="parameters" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="voxelRes" minOccurs="0">
-									<xs:complexType>
-										<xs:attribute name="units" type="xs:string"/>
-										<xs:attribute name="x" type="xs:float"/>
-										<xs:attribute name="y" type="xs:float"/>
-										<xs:attribute name="z" type="xs:float"/>
-									</xs:complexType>
-								</xs:element>
-								<xs:element name="orientation" type="xs:string" minOccurs="0"/>
-								<xs:element name="fov" minOccurs="0">
-									<xs:complexType>
-										<xs:attribute name="x" type="xs:integer"/>
-										<xs:attribute name="y" type="xs:integer"/>
-									</xs:complexType>
-								</xs:element>
-								<xs:element name="rescale" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>Relationship between stored values (SV) and Hounsfield (HU): HU=m*SV+b</xs:documentation>
-									</xs:annotation>
-									<xs:complexType>
-										<xs:sequence minOccurs="0">
-											<xs:element name="intercept" minOccurs="0">
-												<xs:annotation>
-													<xs:documentation>b</xs:documentation>
-												</xs:annotation>
-											</xs:element>
-											<xs:element name="slope" minOccurs="0">
-												<xs:annotation>
-													<xs:documentation>m</xs:documentation>
-												</xs:annotation>
-											</xs:element>
-										</xs:sequence>
-									</xs:complexType>
-								</xs:element>
-								<xs:element name="kvp" type="xs:float" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>Peak output of X-ray generator, in kV</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="acquisitionNumber" type="xs:integer" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>Number identifying the single continuous gathering of data over a period of time resulting in this image</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="imageType" type="xs:string" minOccurs="0"/>
-								<xs:element name="options" type="xs:string" minOccurs="0"/>
-								<xs:element name="collectionDiameter" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>Diameter of the region from which data were used to reconstruct this image, in mm</xs:documentation>
-									</xs:annotation>
-									<xs:simpleType>
-										<xs:restriction base="xs:float">
-											<xs:minInclusive value="0"/>
-										</xs:restriction>
-									</xs:simpleType>
-								</xs:element>
-								<xs:element name="distanceSourceToDetector" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>Distance from source to detector center, in mm</xs:documentation>
-									</xs:annotation>
-									<xs:simpleType>
-										<xs:restriction base="xs:float">
-											<xs:minInclusive value="0"/>
-										</xs:restriction>
-									</xs:simpleType>
-								</xs:element>
-								<xs:element name="distanceSourceToPatient" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>Distance from source to isocenter, in mm</xs:documentation>
-									</xs:annotation>
-									<xs:simpleType>
-										<xs:restriction base="xs:float">
-											<xs:minInclusive value="0"/>
-										</xs:restriction>
-									</xs:simpleType>
-								</xs:element>
-								<xs:element name="gantryTilt" type="xs:float" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>Nominal scanning gantry tilt angle, in degrees</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="tableHeight" type="xs:float" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>Distance from top of patient table to center of rotation (below table > 0), in mm</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="rotationDirection" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>CW=clockwise; CC=counterclockwise</xs:documentation>
-									</xs:annotation>
-									<xs:simpleType>
-										<xs:restriction base="xs:string">
-											<xs:enumeration value="CW"/>
-											<xs:enumeration value="CC"/>
-										</xs:restriction>
-									</xs:simpleType>
-								</xs:element>
-								<xs:element name="exposureTime" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>in ms</xs:documentation>
-									</xs:annotation>
-									<xs:simpleType>
-										<xs:restriction base="xs:float">
-											<xs:minInclusive value="0"/>
-										</xs:restriction>
-									</xs:simpleType>
-								</xs:element>
-								<xs:element name="xrayTubeCurrent" type="xs:float" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>in mA</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="exposure" type="xs:float" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>in mA</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="filter" type="xs:string" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>Label for the type of filter inserted into the x-ray beam</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="generatorPower" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>Power to the x-ray generator, in kW</xs:documentation>
-									</xs:annotation>
-									<xs:simpleType>
-										<xs:restriction base="xs:float">
-											<xs:minInclusive value="0"/>
-										</xs:restriction>
-									</xs:simpleType>
-								</xs:element>
-								<xs:element name="focalSpots" minOccurs="0">
-									<xs:complexType>
-										<xs:sequence minOccurs="0">
-											<xs:element name="focalSpot" minOccurs="0" maxOccurs="unbounded">
-												<xs:annotation>
-													<xs:documentation>Size of focal spot, in mm; if multiple values, small dimensions before large</xs:documentation>
-													<xs:appinfo>
-														<xdat:field uniqueComposite="FSPOT">
-															<xdat:relation uniqueComposite="FSPOT"/>
-														</xdat:field>
-													</xs:appinfo>
-												</xs:annotation>
-												<xs:simpleType>
-													<xs:restriction base="xs:float">
-														<xs:minInclusive value="0"/>
-													</xs:restriction>
-												</xs:simpleType>
-											</xs:element>
-										</xs:sequence>
-									</xs:complexType>
-								</xs:element>
-								<xs:element name="convolutionKernel" type="xs:string" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>Label describing convolution kernel or algorithm used for reconstruction</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="collimationWidth" minOccurs="0">
-									<xs:complexType>
-										<xs:sequence>
-											<xs:element name="single" minOccurs="0">
-												<xs:annotation>
-													<xs:documentation>Width of a single row of acquired data, in mm</xs:documentation>
-												</xs:annotation>
-												<xs:simpleType>
-													<xs:restriction base="xs:float">
-														<xs:minInclusive value="0"/>
-													</xs:restriction>
-												</xs:simpleType>
-											</xs:element>
-											<xs:element name="total" minOccurs="0">
-												<xs:annotation>
-													<xs:documentation>Width of total collimation over the area of active x-ray detection, in mm</xs:documentation>
-												</xs:annotation>
-												<xs:simpleType>
-													<xs:restriction base="xs:float">
-														<xs:minInclusive value="0"/>
-													</xs:restriction>
-												</xs:simpleType>
-											</xs:element>
-										</xs:sequence>
-									</xs:complexType>
-								</xs:element>
-								<xs:element name="tableSpeed" type="xs:float" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>in mm/s</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="tableFeedPerRotation" type="xs:float" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>Motion of table during a complete revolution of the source around the gantry orbit, in mm</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="pitchFactor" type="xs:float" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>Ratio of table feed per rotation to total collimation width</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="estimatedDoseSaving" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>Percent value of dose saving due to modulation; negative value indicates increased exposure</xs:documentation>
-									</xs:annotation>
-									<xs:complexType>
-										<xs:simpleContent>
-											<xs:extension base="xs:float">
-												<xs:attribute name="modulation">
-													<xs:annotation>
-														<xs:documentation>Label describing type of exposure modulation used to limit dose</xs:documentation>
-													</xs:annotation>
-												</xs:attribute>
-											</xs:extension>
-										</xs:simpleContent>
-									</xs:complexType>
-								</xs:element>
-								<xs:element name="ctDIvol" type="xs:float" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>Computed Tomography Dose Index (CTDI_vol), according to IEC 60601-2-44, Ed. 2.1 (Clause 29.1.103.4); describes average dose for this image, in mGy</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="derivation" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>Text description of how this image was derived</xs:documentation>
-									</xs:annotation>
-									<xs:complexType>
-										<xs:simpleContent>
-											<xs:extension base="xs:string"/>
-										</xs:simpleContent>
-									</xs:complexType>
-								</xs:element>
-								<xs:element name="contrastBolus" type="xnat:contrastBolus" minOccurs="0"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="dcmValidation" minOccurs="0">
-						<xs:complexType>
-							<xs:simpleContent>
-								<xs:extension base="xs:string">
-									<xs:attribute name="status" type="xs:boolean"/>
-								</xs:extension>
-							</xs:simpleContent>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="crSessionData">
-		<xs:annotation>
-			<xs:documentation>Computed Radiography Session</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageSessionData"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="crScanData">
-		<xs:annotation>
-			<xs:documentation>Computed Radiography Scan</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageScanData"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="dxSessionData">
-		<xs:annotation>
-			<xs:documentation>An event in which Digital Radiography scans are obtained on a subject</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageSessionData"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="dxScanData">
-		<xs:annotation>
-			<xs:documentation>Digital Radiography Scan</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageScanData"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="mgSessionData">
-		<xs:annotation>
-			<xs:documentation>Digital Mammography Session</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageSessionData"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="mgScanData">
-		<xs:annotation>
-			<xs:documentation>Digital Mammography Scan</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageScanData"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="ioSessionData">
-		<xs:annotation>
-			<xs:documentation>Intraoral Radiography Session</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageSessionData"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="ioScanData">
-		<xs:annotation>
-			<xs:documentation>Intraoral Radiography Scan</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageScanData"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="usSessionData">
-		<xs:annotation>
-			<xs:documentation>Ultrasound Session</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageSessionData"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="usScanData">
-		<xs:annotation>
-			<xs:documentation>Ultrasound Scan</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageScanData"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="ecgSessionData">
-		<xs:annotation>
-			<xs:documentation>Electrocardiography Session</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageSessionData"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="ecgScanData">
-		<xs:annotation>
-			<xs:documentation>Electrocardiography Scan</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageScanData"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="hdSessionData">
-		<xs:annotation>
-			<xs:documentation>Hemodynamic Session</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageSessionData"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="hdScanData">
-		<xs:annotation>
-			<xs:documentation>Hemodynamic Scan</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageScanData"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="epsSessionData">
-		<xs:annotation>
-			<xs:documentation>Cardiac Electrophysiology Session</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageSessionData"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="epsScanData">
-		<xs:annotation>
-			<xs:documentation>Cardiac Electrophysiology Scan</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageScanData"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="xaSessionData">
-		<xs:annotation>
-			<xs:documentation>An event in which X-ray Angiography scans are obtained on a subject</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageSessionData"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="xaScanData">
-		<xs:annotation>
-			<xs:documentation>An individual XA scan sequence</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageScanData">
-				<xs:sequence>
-					<xs:element name="parameters" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="pixelRes" minOccurs="0">
-									<xs:complexType>
-										<xs:attribute name="units" type="xs:string"/>
-										<xs:attribute name="x" type="xs:integer"/>
-										<xs:attribute name="y" type="xs:integer"/>
-									</xs:complexType>
-								</xs:element>
-								<xs:element name="orientation" type="xs:string" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>Orientation(s), separated by comma if multiple</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="fov" minOccurs="0">
-									<xs:complexType>
-										<xs:attribute name="x" type="xs:integer"/>
-										<xs:attribute name="y" type="xs:integer"/>
-									</xs:complexType>
-								</xs:element>
-								<xs:element name="imageType" type="xs:string" minOccurs="0"/>
-								<xs:element name="options" type="xs:string" minOccurs="0"/>
-								<xs:element name="derivation" type="xs:string" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>Text description of how this image was derived</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="contrastBolus" type="xnat:contrastBolus" minOccurs="0"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="rfSessionData">
-		<xs:annotation>
-			<xs:documentation>Radiofluoroscopy Session</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageSessionData"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="rfScanData">
-		<xs:annotation>
-			<xs:documentation>Radiofluoroscopy Scan</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageScanData"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="xa3DSessionData">
-		<xs:annotation>
-			<xs:documentation>X-Ray 3D Angiography Session</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageSessionData"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="xa3DScanData">
-		<xs:annotation>
-			<xs:documentation>X-Ray 3D Angiography Scan</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageScanData"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="dx3DCraniofacialSessionData">
-		<xs:annotation>
-			<xs:documentation>X-Ray 3D Craniofacial Session</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageSessionData"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="dx3DCraniofacialScanData">
-		<xs:annotation>
-			<xs:documentation>X-Ray 3D Craniofacial Scan</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageScanData"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="nmSessionData">
-		<xs:annotation>
-			<xs:documentation>Nuclear Medicine Image Session</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageSessionData"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="nmScanData">
-		<xs:annotation>
-			<xs:documentation>Nuclear Medicine Image</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageScanData"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="srSessionData">
-		<xs:annotation>
-			<xs:documentation>Structured Report Image Session</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageSessionData"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="srScanData">
-		<xs:annotation>
-			<xs:documentation>Structured Report Image</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageScanData"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="esSessionData">
-		<xs:annotation>
-			<xs:documentation>Visible Light Endoscopy Session</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageSessionData"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="esScanData">
-		<xs:annotation>
-			<xs:documentation>Visible Light Endoscopy Scan</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageScanData"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="esvSessionData">
-		<xs:annotation>
-			<xs:documentation>Video Endoscopy Session</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageSessionData"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="esvScanData">
-		<xs:annotation>
-			<xs:documentation>Video Endoscopy Scan</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageScanData"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="gmSessionData">
-		<xs:annotation>
-			<xs:documentation>Visible Light Microscopy Session</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageSessionData"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="gmScanData">
-		<xs:annotation>
-			<xs:documentation>Visible Light Microscopy Scan</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageScanData"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="gmvSessionData">
-		<xs:annotation>
-			<xs:documentation>Video Microscopy Session</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageSessionData"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="gmvScanData">
-		<xs:annotation>
-			<xs:documentation>Video Microscopy Scan</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageScanData"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="smSessionData">
-		<xs:annotation>
-			<xs:documentation>Visible Light Slide-Coordinates Microscopy Session</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageSessionData"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="smScanData">
-		<xs:annotation>
-			<xs:documentation>Visible Light Slide-Coordinates Microscopy Scan</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageScanData"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="xcSessionData">
-		<xs:annotation>
-			<xs:documentation>Visible Light Photography Session</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageSessionData"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="xcScanData">
-		<xs:annotation>
-			<xs:documentation>Visible Light Photography Scan</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageScanData"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="xcvSessionData">
-		<xs:annotation>
-			<xs:documentation>Video Photography Session</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageSessionData"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="xcvScanData">
-		<xs:annotation>
-			<xs:documentation>Video Photography Scan</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageScanData"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="opSessionData">
-		<xs:annotation>
-			<xs:documentation>Ophthalmic Photography Session</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageSessionData"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="opScanData">
-		<xs:annotation>
-			<xs:documentation>Ophthalmic Photography Scan</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageScanData"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="optSessionData">
-		<xs:annotation>
-			<xs:documentation>Ophthalmic Tomography Session</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageSessionData"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="optScanData">
-		<xs:annotation>
-			<xs:documentation>Ophthalmic Tomography Scan</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageScanData">
-				<xs:sequence>
-					<xs:element name="parameters" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="voxelRes" minOccurs="0">
-									<xs:complexType>
-										<xs:attribute name="units" type="xs:string"/>
-										<xs:attribute name="x" type="xs:float"/>
-										<xs:attribute name="y" type="xs:float"/>
-										<xs:attribute name="z" type="xs:float"/>
-									</xs:complexType>
-								</xs:element>
-								<xs:element name="fov" minOccurs="0">
-									<xs:complexType>
-										<xs:attribute name="x" type="xs:integer"/>
-										<xs:attribute name="y" type="xs:integer"/>
-									</xs:complexType>
-								</xs:element>
-								<xs:element name="laterality" type="xs:string" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>Laterality of (paired) body part examined: R (right) or L (left)</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="illumination_wavelength" type="xs:string" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>Wavelength of the illuminator, in nm</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="illumination_power" type="xs:string" minOccurs="0">
-									<xs:annotation>
-										<xs:documentation>Power of the illuminator in microwatts at corneal plane</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="imageType" type="xs:string" minOccurs="0"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="dcmValidation" minOccurs="0">
-						<xs:complexType>
-							<xs:simpleContent>
-								<xs:extension base="xs:string">
-									<xs:attribute name="status" type="xs:boolean" use="optional"/>
-								</xs:extension>
-							</xs:simpleContent>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="rtSessionData">
-		<xs:annotation>
-			<xs:documentation>Radiotherapy Session</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageSessionData"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="rtImageScanData">
-		<xs:annotation>
-			<xs:documentation>Radiotherapy Image</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageScanData"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="otherDicomSessionData">
-		<xs:annotation>
-			<xs:documentation>DICOM study of undetermined type</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageSessionData"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="scScanData">
-		<xs:annotation>
-			<xs:documentation>DICOM Secondary Capture Image Series</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageScanData"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="segScanData">
-		<xs:annotation>
-			<xs:documentation>DICOM Segmentation Series</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageScanData"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="mrsScanData">
-		<xs:annotation>
-			<xs:documentation>MR Spectroscopy Scan</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageScanData"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="voiceAudioScanData">
-		<xs:annotation>
-			<xs:documentation>DICOM Basic Voice Audio Series</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageScanData"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="otherDicomScanData">
-		<xs:annotation>
-			<xs:documentation>DICOM series of undetermined type</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageScanData"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- Base Scan QC data. Should be applicable to all modalities -->
-	<xs:complexType name="qcScanData">
-		<xs:annotation>
-			<xs:appinfo>
-				<xdat:element displayIdentifiers="imageScan_ID"/>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="imageScan_ID" type="xs:string">
-				<xs:annotation>
-					<xs:appinfo>
-						<xdat:field uniqueComposite="qc_scan_id_fk"/>
-					</xs:appinfo>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="rater" type="xs:string" minOccurs="0"/>
-			<xs:element name="coverage" type="xs:string" minOccurs="0"/>
-			<xs:element name="motion" type="xs:string" minOccurs="0"/>
-			<xs:element name="otherImageArtifacts" minOccurs="0">
-				<xs:simpleType>
-					<xs:restriction base="xs:string">
-						<xs:maxLength value="1000"/>
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:element>
-			<xs:element name="comments" minOccurs="0">
-				<xs:simpleType>
-					<xs:restriction base="xs:string">
-						<xs:maxLength value="1000"/>
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:element>
-			<xs:element name="pass" type="xs:string"/>
-			<xs:element name="rating" minOccurs="0">
-				<xs:complexType>
-					<xs:simpleContent>
-						<xs:extension base="xs:string">
-							<xs:attribute name="scale" type="xs:string"/>
-						</xs:extension>
-					</xs:simpleContent>
-				</xs:complexType>
-			</xs:element>
-			
-			<xs:element name="fields" minOccurs="0">
-				<xs:complexType>
-					<xs:sequence minOccurs="0">
-						<xs:element name="field" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:appinfo>
-									<xdat:element displayIdentifiers="name"/>
-									<xdat:field>
-										<xdat:relation uniqueComposite="NAME"/>
-									</xdat:field>
-								</xs:appinfo>
-							</xs:annotation>
-							<xs:complexType>
-								<xs:simpleContent>
-									<xs:extension base="xs:string">
-										<xs:attribute name="name" type="xs:string">
-											<xs:annotation>
-												<xs:appinfo>
-													<xdat:field uniqueComposite="NAME"/>
-												</xs:appinfo>
-											</xs:annotation>
-										</xs:attribute>
-									</xs:extension>
-								</xs:simpleContent>
-							</xs:complexType>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!-- Base MR Scan QC data. Should be applicable to all types of MR scans -->
-	<xs:complexType name="mrQcScanData">
-		<xs:complexContent>
-			<xs:extension base="xnat:qcScanData">
-				<xs:sequence>
-					<xs:element name="blurring" type="xs:string" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Bluring, Ghosting, or Ringing artifacts on the Scan</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="flow" type="xs:string" minOccurs="0"/>
-					<xs:element name="imageContrast" type="xs:string" minOccurs="0"/>
-					<xs:element name="inhomogeneity" type="xs:string" minOccurs="0"/>
-					<xs:element name="wrap" type="xs:string" minOccurs="0"/>
-					<xs:element name="susceptibility" type="xs:string" minOccurs="0"/>
-					<xs:element name="interpacMotion" type="xs:string" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="petQcScanData">
-		<xs:complexContent>
-			<xs:extension base="xnat:qcScanData">
-				<xs:sequence>
-					<xs:element name="acquisition" type="xs:string" minOccurs="0"/>
-					<xs:element name="correctReconstructionAlgorithm" type="xs:string" minOccurs="0"/>
-					<xs:element name="reconstructionAlgorithmUsed" type="xs:string" minOccurs="0"/>
-					<xs:element name="correctIterationsAndSubsets" type="xs:string" minOccurs="0"/>
-					<xs:element name="correctFilters" type="xs:string" minOccurs="0"/>
-					<xs:element name="correctSliceThickness" type="xs:string" minOccurs="0"/>
-					<xs:element name="acceptableVoxelSize" type="xs:string" minOccurs="0"/>
-					<xs:element name="unacceptableFrames" type="xs:string" minOccurs="0"/>
-					<xs:element name="reasonFramesUnacceptable" type="xs:string" minOccurs="0"/>
-					<xs:element name="processingErrors" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="processingError" type="xs:string" maxOccurs="unbounded">
-									<xs:annotation>
-										<xs:appinfo>
-											<xdat:field uniqueComposite="qc_processing_error_fk">
-												<xdat:relation uniqueComposite="qc_processing_error_fk" relationType="single"/>
-											</xdat:field>
-										</xs:appinfo>
-									</xs:annotation>
-								</xs:element>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="qcOutcome" type="xs:string" minOccurs="0"/>
-					<xs:element name="qcOutcomeReason" type="xs:string" minOccurs="0"/>
-					<xs:element name="topCutoff" type="xs:string" minOccurs="0"/>
-					<xs:element name="bottomCutoff" type="xs:string" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="otherQcScanData">
-		<xs:complexContent>
-			<xs:extension base="xnat:qcScanData">
-				<xs:sequence>
-					<xs:element name="other" type="xs:string" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- Session level QC assessment -->
-	<xs:complexType name="qcManualAssessorData">
-		<xs:complexContent>
-			<xs:extension base="xnat:imageAssessorData">
-				<xs:sequence>
-					<xs:element name="rater" type="xs:string" minOccurs="0"/>
-					<xs:element name="stereotacticMarker" type="xs:string" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Marker placed and located correctly.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="incidentalFindings" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Possible clinical findings made during Quality Control. Not necessarily authorizative or clinical diagnoses. Further investigation required.</xs:documentation>
-						</xs:annotation>
-						<xs:simpleType>
-							<xs:restriction base="xs:string">
-								<xs:maxLength value="1000"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element name="scans" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="scan" type="xnat:qcScanData" maxOccurs="unbounded">
-									<xs:annotation>
-										<xs:appinfo>
-											<xdat:field>
-												<xdat:relation uniqueComposite="qc_scan_id_fk" relationType="single"/>
-											</xdat:field>
-										</xs:appinfo>
-									</xs:annotation>
-								</xs:element>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="comments" minOccurs="0">
-						<xs:simpleType>
-							<xs:restriction base="xs:string">
-								<xs:maxLength value="1000"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element name="pass" type="xs:string"/>
-					<xs:element name="payable" type="xs:string" minOccurs="0"/>
-					<xs:element name="rescan" type="xs:string" minOccurs="0"/>
-					<xs:element name="resolvable" type="xs:string" minOccurs="0"/>
-					<xs:element name="retrain" type="xs:string" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="megSessionData">
-		<xs:annotation>
-			<xs:documentation>Magnetoencephalography Session</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageSessionData"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="megScanData">
-		<xs:annotation>
-			<xs:documentation>Magnetoencephalography Scan</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageScanData"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="eegSessionData">
-		<xs:annotation>
-			<xs:documentation>Electroencephalography Session</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageSessionData"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="eegScanData">
-		<xs:annotation>
-			<xs:documentation>Electroencephalography Scan</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xnat:imageScanData"/>
-		</xs:complexContent>
-	</xs:complexType>
-</xs:schema>
-- 
GitLab