diff --git a/json_schemas/Experiment.schema.08012016.json b/json_schemas/Experiment.schema.08012016.json
deleted file mode 100644
index db0be816..00000000
--- a/json_schemas/Experiment.schema.08012016.json
+++ /dev/null
@@ -1,106 +0,0 @@
-{
-    "$schema": "http://json-schema.org/draft-04/schema#",
-    "description": "A representation of a Blueprint Experiment XML",
-    "type": "object",
-    "properties": {
-	"id": {
-	    "type": "string",
-	    "pattern": "^ERX",
-	     "minLength": 4
-	},
-	"entity_type": {
-	    "type": "string",
-	    "enum": ["EXPERIMENT","SAMPLE","RUN","STUDY"]
-	    
-	},
-	"attributes" : {
-	    "type": "array",
-	    "minItems": 2,
-	    "uniqueItems": true,
-	    "items": {
-		"oneOf": [ 
-		    {
-			"type": "object",
-			"properties": {
-			    "ENA-SUBMISSION-TOOL": {
-				"type": "string",
-				"enum": ["SRA-Webin"]
-			    },
-			    "EXPERIMENT_TYPE": {
-				"type": "string",
-				"enum": ["Chromatin Accessibility","DNA Methylation","Histone H3K4me1","Histone H3K4me3",
-					 "Histone H3K9me3","Histone H3K9ac","Histone H3K27me3", "Histone H3K36me3","Ribo Minus RNA sequencing"]
-			    },
-			    "EXTRACTION_PROTOCOL": {
-				"type": "string",
-				"enum": ["TRIzol RNA Isolation for cells."]
-			    },
-			    "EXTRACTION_PROTOCOL_MRNA_ENRICHMENT": {
-				"type": "string"
-			    },
-			    "EXTRACTION_PROTOCOL_FRAGMENTATION": {
-				"type": "string"
-			    },
-			    "MRNA_PREPARATION_INITIAL_MRNA_QNTY": {
-				"type": "string"
-			    },
-			    "MRNA_PREPARATION_FRAGMENT_SIZE_RANGE": {
-				"type": "string"
-			    },
-			     "RNA_PREPARATION_5'_RNA_ADAPTER_SEQUENCE": {
-				"type": "string"
-			    },
-			    "RNA_PREPARATION_3'_RNA_ADAPTER_SEQUENCE": {
-				"type": "string"
-			    },
-			    "RNA_PREPARATION_REVERSE_TRANSCRIPTION_PRIMER_SEQUENCE": {
-				"type": "string"
-			    },
-			    "RNA_PREPARATION_5'_DEPHOSPHORYLATION": {
-				"type": "string"
-			    },
-			    "RNA_PREPARATION_5'_PHOSPHORYLATION": {
-				"type": "string"
-			    },
-			    "RNA_PREPARATION_3'_RNA ADAPTER_LIGATION_PROTOCOL": {
-				"type": "string"
-			    },
-			    "RNA_PREPARATION_5'_RNA_ADAPTER_LIGATION_PROTOCOL": {
-				"type": "string"
-			    },
-			    "RNA_PREPARATION_REVERSE_TRANSCRIPTION_PROTOCOL": {
-				"type": "string"
-			    },
-			    "LIBRARY_GENERATION_PCR_TEMPLATE_CONC": {
-				"type": "string"
-			    },
-			    "LIBRARY_GENERATION_PCR_POLYMERASE_TYPE": {
-				"type": "string"
-			    },
-			    "LIBRARY_GENERATION_PCR_THERMOCYCLING_PROGRAM": {
-				"type": "string"
-			    },
-			    "LIBRARY_GENERATION_PCR_NUMBER_CYCLES": {
-				"type": "string"
-			    },
-			    "LIBRARY_GENERATION_PCR_F_PRIMER_": {
-				"type": "string"
-			    },
-			    "LIBRARY_GENERATION_PCR_R_PRIMER_SEQUENCE": {
-				"type": "string"
-			    },
-			    "LIBRARY_GENERATION_PCR_PRIMER_CONC": {
-				"type": "string"
-			    },
-			    "LIBRARY_GENERATION_PCR_PRODUCT_ISOLATION_PROTOCOL":{
-				"type": "string"
-			    }
-			},
-			"additionalProperties":false
-		    }
-		]
-	    }
-	}
-    },
-    "required": ["id","entity_type","attributes"]
-}
diff --git a/json_schemas/Experiment.schema.26012016.json b/json_schemas/Experiment.schema.26012016.json
deleted file mode 100644
index b9e76988..00000000
--- a/json_schemas/Experiment.schema.26012016.json
+++ /dev/null
@@ -1,97 +0,0 @@
-{
-    "$schema": "http://json-schema.org/draft-04/schema#",
-    "description": "A representation of a Blueprint Experiment XML",
-    "type": "object",
-    "properties": {
-	"id": {
-	    "type": "string",
-	    "pattern": "^ERX",
-	     "minLength": 4
-	},
-	"entity_type": {
-	    "type": "string",
-	    "enum": ["EXPERIMENT","SAMPLE","RUN","STUDY"]
-	    
-	},
-	"attributes" : {
-	    "type": "object",
-		"required": ["EXPERIMENT_TYPE", "EXTRACTION_PROTOCOL" ],
-		"properties": {
-		    "ENA-SUBMISSION-TOOL": {
-			"type": "string",
-			"enum": ["SRA-Webin"]
-		    },
-		    "EXPERIMENT_TYPE": {
-			"type": "string",
-			"enum": ["Chromatin Accessibility","DNA Methylation","Histone H3K4me1","Histone H3K4me3",
-				 "Histone H3K9me3","Histone H3K9ac","Histone H3K27me3", "Histone H3K36me3","Ribo Minus RNA sequencing"]
-		    },
-		    "EXTRACTION_PROTOCOL": {
-			"type": "string"
-		    },
-		    "EXTRACTION_PROTOCOL_MRNA_ENRICHMENT": {
-			"type": "string"
-		    },
-		    "EXTRACTION_PROTOCOL_FRAGMENTATION": {
-			"type": "string"
-		    },
-		    "MRNA_PREPARATION_INITIAL_MRNA_QNTY": {
-			"type": "string"
-		    },
-		    "MRNA_PREPARATION_FRAGMENT_SIZE_RANGE": {
-			"type": "string"
-		    },
-		     "RNA_PREPARATION_5'_RNA_ADAPTER_SEQUENCE": {
-			"type": "string"
-		    },
-		    "RNA_PREPARATION_3'_RNA_ADAPTER_SEQUENCE": {
-			"type": "string"
-		    },
-		    "RNA_PREPARATION_REVERSE_TRANSCRIPTION_PRIMER_SEQUENCE": {
-			"type": "string"
-		    },
-		    "RNA_PREPARATION_5'_DEPHOSPHORYLATION": {
-			"type": "string"
-		    },
-		    "RNA_PREPARATION_5'_PHOSPHORYLATION": {
-			"type": "string"
-		    },
-		    "RNA_PREPARATION_3'_RNA ADAPTER_LIGATION_PROTOCOL": {
-			"type": "string"
-		    },
-		    "RNA_PREPARATION_5'_RNA_ADAPTER_LIGATION_PROTOCOL": {
-			"type": "string"
-		    },
-		    "RNA_PREPARATION_REVERSE_TRANSCRIPTION_PROTOCOL": {
-			"type": "string"
-		    },
-		    "LIBRARY_GENERATION_PCR_TEMPLATE_CONC": {
-			"type": "string"
-		    },
-		    "LIBRARY_GENERATION_PCR_POLYMERASE_TYPE": {
-			"type": "string"
-		    },
-		    "LIBRARY_GENERATION_PCR_THERMOCYCLING_PROGRAM": {
-			"type": "string"
-		    },
-		    "LIBRARY_GENERATION_PCR_NUMBER_CYCLES": {
-			"type": "string"
-		    },
-		    "LIBRARY_GENERATION_PCR_F_PRIMER_": {
-			"type": "string"
-		    },
-		    "LIBRARY_GENERATION_PCR_R_PRIMER_SEQUENCE": {
-			"type": "string"
-		    },
-		    "LIBRARY_GENERATION_PCR_PRIMER_CONC": {
-			"type": "string"
-		    },
-		    "LIBRARY_GENERATION_PCR_PRODUCT_ISOLATION_PROTOCOL":{
-			"type": "string"
-		    }
-		},
-		"additionalProperties":true
-		},
-    "required": ["id","entity_type","attributes"]
-	}
-}
diff --git a/json_schemas/Experiment.schema.dev.json b/json_schemas/Experiment.schema.dev.json
deleted file mode 100644
index c572c3ca..00000000
--- a/json_schemas/Experiment.schema.dev.json
+++ /dev/null
@@ -1,74 +0,0 @@
-{
-    "$schema": "http://json-schema.org/draft-04/schema#",
-    "description": "A representation of a Blueprint Experiment XML",
-    "type": "object",
-    "properties": {
-	"id": {
-	    "type": "string",
-	    "pattern": "^ERX",
-	     "minLength": 4
-	},
-	"entity_type": {
-	    "type": "string",
-	    "enum": ["EXPERIMENT","SAMPLE","RUN","STUDY"]
-	    
-	},
-	 "attributes": {
-		"type": "object",
-		"properties":
-    	{
-			"SELECTOR":
-			{
-				"oneOf":
-				[
-					{
-						"properties":
-						{
-			    			"ENA-SUBMISSION-TOOL": {"$ref":"#/definitions/ENA-SUBMISSION-TOOL"},
-			    			"EXPERIMENT_TYPE": {"$ref":"#/definitions/EXPERIMENT_TYPE"},
-			    			"EXTRACTION_PROTOCOL": {"type": "string"},
-						    "EXTRACTION_PROTOCOL_MRNA_ENRICHMENT": {"type": "string"},
-						    "EXTRACTION_PROTOCOL_FRAGMENTATION": {"type": "string"},
-						    "MRNA_PREPARATION_INITIAL_MRNA_QNTY": {"type": "string"},
-						    "MRNA_PREPARATION_FRAGMENT_SIZE_RANGE": {"type": "string"},
-						    "RNA_PREPARATION_5'_RNA_ADAPTER_SEQUENCE": {"type": "string"},
-						    "RNA_PREPARATION_3'_RNA_ADAPTER_SEQUENCE": {"type": "string"},
-						    "RNA_PREPARATION_REVERSE_TRANSCRIPTION_PRIMER_SEQUENCE": {"type": "string"},
-						    "RNA_PREPARATION_5'_DEPHOSPHORYLATION": {"type": "string"},
-						    "RNA_PREPARATION_5'_PHOSPHORYLATION": {"type": "string"},
-						    "RNA_PREPARATION_3'_RNA ADAPTER_LIGATION_PROTOCOL": {"type": "string"},
-						    "RNA_PREPARATION_5'_RNA_ADAPTER_LIGATION_PROTOCOL": {"type": "string"},
-						    "RNA_PREPARATION_REVERSE_TRANSCRIPTION_PROTOCOL": {"type": "string"},
-						    "LIBRARY_GENERATION_PCR_TEMPLATE_CONC": {"type": "string"},
-						    "LIBRARY_GENERATION_PCR_POLYMERASE_TYPE": {"type": "string"},
-						    "LIBRARY_GENERATION_PCR_THERMOCYCLING_PROGRAM": {"type": "string"},
-						    "LIBRARY_GENERATION_PCR_NUMBER_CYCLES": {"type": "string"},
-						    "LIBRARY_GENERATION_PCR_F_PRIMER_": {"type": "string"},
-						    "LIBRARY_GENERATION_PCR_R_PRIMER_SEQUENCE": {"type": "string"},
-						    "LIBRARY_GENERATION_PCR_PRIMER_CONC": {"type": "string"},
-						    "LIBRARY_GENERATION_PCR_PRODUCT_ISOLATION_PROTOCOL":{"type": "string"}
-          				},
-						"required":["EXPERIMENT_TYPE", "EXTRACTION_PROTOCOL" ],
-						"additionalProperties":true
-					}
-				]
-			}
-		},
-		"additionalProperties":false,
-		"required":["SELECTOR"] 
-	}
-	},
-	"required": ["id","entity_type","attributes"],
-	
-	"definitions": {
-		"ENA-SUBMISSION-TOOL": {
-			"type": "string",
-			"enum": ["SRA-Webin"]
-		},
-		"EXPERIMENT_TYPE": {
-			"type": "string",
-			"enum": ["Chromatin Accessibility","DNA Methylation","Histone H3K27ac","Histone H3K4me1","Histone H3K4me3",
- 			   "Histone H3K9me3","Histone H3K9ac","Histone H3K27me3", "Histone H3K36me3","Ribo Minus RNA sequencing"]
-		}
-	}
-}		
diff --git a/json_schemas/Experiment.schema.json b/json_schemas/Experiment.schema.json
deleted file mode 100644
index bdce0e78..00000000
--- a/json_schemas/Experiment.schema.json
+++ /dev/null
@@ -1,105 +0,0 @@
-{
-    "$schema": "http://json-schema.org/draft-04/schema#",
-    "description": "A representation of a Blueprint Experiment XML",
-    "type": "object",
-    "properties": {
-	"id": {
-	    "type": "string",
-	    "pattern": "^ERX",
-	     "minLength": 4
-	},
-	"entity_type": {
-	    "type": "string",
-	    "enum": ["EXPERIMENT","SAMPLE","RUN","STUDY"]
-	    
-	},
-	"attributes" : {
-	    "type": "array",
-	    "minItems": 2,
-	    "uniqueItems": true,
-	    "items": {
-		"oneOf": [ 
-		    {
-			"type": "object",
-			"properties": {
-			    "ENA-SUBMISSION-TOOL": {
-				"type": "string",
-				"enum": ["SRA-Webin"]
-			    },
-			    "EXPERIMENT_TYPE": {
-				"type": "string",
-				"enum": ["Ribo Minus RNA sequencing","Bisulfite-Seq"]
-			    },
-			    "EXTRACTION_PROTOCOL": {
-				"type": "string",
-				"enum": ["TRIzol RNA Isolation for cells."]
-			    },
-			    "EXTRACTION_PROTOCOL_MRNA_ENRICHMENT": {
-				"type": "string"
-			    },
-			    "EXTRACTION_PROTOCOL_FRAGMENTATION": {
-				"type": "string"
-			    },
-			    "MRNA_PREPARATION_INITIAL_MRNA_QNTY": {
-				"type": "string"
-			    },
-			    "MRNA_PREPARATION_FRAGMENT_SIZE_RANGE": {
-				"type": "string"
-			    },
-			     "RNA_PREPARATION_5'_RNA_ADAPTER_SEQUENCE": {
-				"type": "string"
-			    },
-			    "RNA_PREPARATION_3'_RNA_ADAPTER_SEQUENCE": {
-				"type": "string"
-			    },
-			    "RNA_PREPARATION_REVERSE_TRANSCRIPTION_PRIMER_SEQUENCE": {
-				"type": "string"
-			    },
-			    "RNA_PREPARATION_5'_DEPHOSPHORYLATION": {
-				"type": "string"
-			    },
-			    "RNA_PREPARATION_5'_PHOSPHORYLATION": {
-				"type": "string"
-			    },
-			    "RNA_PREPARATION_3'_RNA ADAPTER_LIGATION_PROTOCOL": {
-				"type": "string"
-			    },
-			    "RNA_PREPARATION_5'_RNA_ADAPTER_LIGATION_PROTOCOL": {
-				"type": "string"
-			    },
-			    "RNA_PREPARATION_REVERSE_TRANSCRIPTION_PROTOCOL": {
-				"type": "string"
-			    },
-			    "LIBRARY_GENERATION_PCR_TEMPLATE_CONC": {
-				"type": "string"
-			    },
-			    "LIBRARY_GENERATION_PCR_POLYMERASE_TYPE": {
-				"type": "string"
-			    },
-			    "LIBRARY_GENERATION_PCR_THERMOCYCLING_PROGRAM": {
-				"type": "string"
-			    },
-			    "LIBRARY_GENERATION_PCR_NUMBER_CYCLES": {
-				"type": "string"
-			    },
-			    "LIBRARY_GENERATION_PCR_F_PRIMER_": {
-				"type": "string"
-			    },
-			    "LIBRARY_GENERATION_PCR_R_PRIMER_SEQUENCE": {
-				"type": "string"
-			    },
-			    "LIBRARY_GENERATION_PCR_PRIMER_CONC": {
-				"type": "string"
-			    },
-			    "LIBRARY_GENERATION_PCR_PRODUCT_ISOLATION_PROTOCOL":{
-				"type": "string"
-			    }
-			},
-			"additionalProperties":false
-		    }
-		]
-	    }
-	}
-    },
-    "required": ["id","entity_type","attributes"]
-}
diff --git a/json_schemas/Sample.schema.1603.json b/json_schemas/Sample.schema.1603.json
deleted file mode 100644
index 54b971ea..00000000
--- a/json_schemas/Sample.schema.1603.json
+++ /dev/null
@@ -1,207 +0,0 @@
-{
-  "$schema":"http://json-schema.org/draft-04/schema#",
-  "title":"North America address",
-  "description":"Postal addresses for Canada, USA and Mexico",
-
-  "type":"object",
-  "properties":
-  {
-  	"id": {
-  	    "type": "string",
-  	     "minLength": 2
-  	},
-  	"entity_type": {
-  	    "type": "string",
-  	    "enum": ["EXPERIMENT","SAMPLE","RUN","STUDY"]
-	    
-  	},
-    "attributes":
-    {
-      "type":"object",
-      "properties":
-      {
-        "SELECTOR":
-        {
-          "oneOf":
-          [
-            {
-              "properties":
-              {
-				"BIOMATERIAL_PROVIDER":{"$ref":"#/definitions/BIOMATERIAL_PROVIDER"},
-                "BIOMATERIAL_TYPE":{"type":"string", "enum":["Primary Cell"]},
-                "CELL_TYPE": {"$ref":"#/definitions/CELL_TYPE"},
-				"cell_type": {"$ref":"#/definitions/CELL_TYPE"},
-				"DISEASE_ONTOLOGY_URI": {"$ref":"#/definitions/DISEASE_ONTOLOGY_URI"},
-				"DONOR_AGE": {"$ref":"#/definitions/DONOR_AGE"},
-				"DONOR_ETHNICITY": {"$ref":"#/definitions/DONOR_ETHNICITY"},
-				"DONOR_HEALTH_STATUS": {"$ref":"#/definitions/DONOR_HEALTH_STATUS"},
-				"DONOR_ID": {"type": "string"},
-				"DONOR_SEX": {"$ref":"#/definitions/DONOR_SEX"},
-				"gender": {"$ref":"#/definitions/gender"},
-				"MARKERS":{
-					"type":"string",
-					"pattern": "^CD"
-				},
-				"MOLECULE":{"$ref":"#/definitions/MOLECULE"},
-			    "subject_id": {"type": "string"},
-			    "PASSAGE_IF_EXPANDED": {"type": "string"},
-			    "phenotype": {"type": "string"},
-				"SAMPLE_ONTOLOGY_URI": {
-		 		   "type": "string",
-		 		   "pattern": "http://purl.obolibrary.org/obo/CL_+"
-		 	    },
-				"subject_id": {"type": "string"},
-			    "TISSUE_DEPOT": {"type": "string"},
-				"TISSUE_TYPE":{"$ref":"#/definitions/TISSUES"},
-			    "TREATMENT": {"type": "string"}
-              },
-              "additionalProperties":true,
-              "required":["BIOMATERIAL_PROVIDER","BIOMATERIAL_TYPE", "CELL_TYPE", "DISEASE_ONTOLOGY_URI","DONOR_AGE", "DONOR_ETHNICITY","DONOR_HEALTH_STATUS","DONOR_ID","DONOR_SEX","gender","MARKERS","MOLECULE",
-				  "PASSAGE_IF_EXPANDED","SAMPLE_ONTOLOGY_URI","subject_id"]
-            },
-            {
-              "properties":
-              {
-				  "BIOMATERIAL_PROVIDER":{"$ref":"#/definitions/BIOMATERIAL_PROVIDER"},
-                  "BIOMATERIAL_TYPE":{"type":"string", "enum":["Primary Tissue"]},
-				  "COLLECTION_METHOD":{"type":"string"},
-			      "DISEASE_ONTOLOGY_URI": {"$ref":"#/definitions/DISEASE_ONTOLOGY_URI"},
-				  "DONOR_AGE": {"$ref":"#/definitions/DONOR_AGE"},
-				  "DONOR_ETHNICITY": {"$ref":"#/definitions/DONOR_ETHNICITY"},
-				  "DONOR_HEALTH_STATUS": {"$ref":"#/definitions/DONOR_HEALTH_STATUS"},
-				  "DONOR_ID": {"type": "string"},
-				  "DONOR_SEX": {"$ref":"#/definitions/DONOR_SEX"},
-				  "gender": {"$ref":"#/definitions/gender"},
-				  "MOLECULE":{"$ref":"#/definitions/MOLECULE"},
-				  "PASSAGE_IF_EXPANDED": {"type": "string"},
-				  "phenotype": {"type": "string"},
-				  "SAMPLE_ONTOLOGY_URI": {
-					  "type": "string",
-					  "pattern": "http://purl.obolibrary.org/obo/UBERON_+"
-			   	  },
-				  "subject_id": {"type": "string"},
-                  "TISSUE_TYPE":{"$ref":"#/definitions/TISSUES"},
-				  "TISSUE_DEPOT": {"type": "string"},
-				  "TREATMENT": {"type": "string"}
-              },
-              "additionalProperties":true,
-              "required":["BIOMATERIAL_PROVIDER","BIOMATERIAL_TYPE","COLLECTION_METHOD","DISEASE_ONTOLOGY_URI","DONOR_AGE","DONOR_ETHNICITY","DONOR_HEALTH_STATUS","DONOR_ID","DONOR_SEX","gender","MOLECULE",
-				  "PASSAGE_IF_EXPANDED","SAMPLE_ONTOLOGY_URI","subject_id","TISSUE_TYPE"]
-            },
-			{
-				"properties":
-				{
-					"BIOMATERIAL_PROVIDER":{"$ref":"#/definitions/BIOMATERIAL_PROVIDER"},
-					"BIOMATERIAL_TYPE":{"type":"string", "enum":["Cell Line"]},
-    				"DIFFERENTIATION_STAGE": {"type": "string"},
-    				"DIFFERENTIATION_METHOD": {"type": "string"},
-    				"DISEASE": {"$ref":"#/definitions/DISEASE"},
-    				"DISEASE_ONTOLOGY_URI": {"$ref":"#/definitions/DISEASE_ONTOLOGY_URI"},
-    				"LINE": {"$ref":"#/definitions/LINE"},
-    				"LINEAGE": {"type":"string"},
-    				"MEDIUM": {"type":"string"},
-    				"MOLECULE":{"$ref":"#/definitions/MOLECULE"},
-    				"PASSAGE": {"type":"string"},
-    			  	"SAMPLE_ONTOLOGY_URI": {
-    					"type": "string",
-    				  	"pattern": "http://purl.obolibrary.org/obo/UBERON_+"
-    		   	  	},
-    				"SEX": {"$ref":"#/definitions/SEX"}
-				},
-				"additionalProperties":true,
-				"required":["BIOMATERIAL_PROVIDER","BIOMATERIAL_TYPE","DIFFERENTIATION_STAGE","DIFFERENTIATION_METHOD","DISEASE","DISEASE_ONTOLOGY_URI","LINE","LINEAGE","MEDIUM","MOLECULE","PASSAGE",
-							"SAMPLE_ONTOLOGY_URI","SEX"]
-			}
-          ]
-        }
-      },
-      "additionalProperties":false,
-      "required":["SELECTOR"]
-    }
-  },
-   "required": ["id","entity_type","attributes"],
-   
-   "definitions": {
-	   "BIOMATERIAL_PROVIDER": {
-		   "type": "string",
-		   "enum": ["-","Anke Bergmann","Anke Bergmann/ Siebert","DSMZ","Felipe Prosper in collaboration with Jose I. Martin-Subero, University of Navarra","ICGC_Siebert/Bergmann",
-			 "Jose I. Martin-Subero","NCMLS","Nijmegen","Necker's hospital","NIHR Cambridge BioResource","Prof.dr. E. Vellenga, University Medical Centre Groningen - Department of Hematology",
-			 "Prof: Lucia Altucci  (SECONDA UNIVERSITA' di NAPOLI- IT)","Sanquin Amsterdam","Sanquin Blood bank, Nijmegen, the Netherlands","Sanquin_Nijmegen","WP4_Bergmann_Siebert_Martin-Subero"]
-	   },
-	   "CELL_TYPE": {
-		   "type": "string",
-		   "enum": ["-","adult endothelial progenitor cell alternatively","activated macrophage","band form neutrophil","blast forming unit erythroid","naive B cell","CD14-positive, CD16-negative classical monocyte",
-	   		"CD34-negative, CD41-positive, CD42-positive megakaryocyte cell","CD38-negative naive B cell","double-positive, alpha-beta thymocyte", "CD4-positive, alpha-beta T cell", "CD4-positive, alpha-beta thymocyte",
-	   		"CD8-positive, alpha-beta T cell","CD8-positive, alpha-beta thymocyte","central memory CD4-positive, alpha-beta T cell","central memory CD8-positive, alpha-beta T cell","class switched memory B cell",
-	   	 	"colony forming unit erythroid","common lymphoid progenitor","common myeloid progenitor","conventional dendritic cell","CD16-positive, CD56-dim natural killer cell","dendritic cell","effector memory CD4-positive, alpha-beta T cell",
-	   	 	"effector memory CD8-positive, alpha-beta T cell","effector memory CD8-positive, alpha-beta T cell, terminally differentiated","endothelial cell of umbilical vein (proliferating)","endothelial cell of umbilical vein (resting)",
-	   	 	"erythroblast","germinal center B cell","granulocyte monocyte progenitor cell","hematopoietic multipotent progenitor cell","hematopoietic stem cell","inflammatory macrophage","late basophilic and polychromatophilic erythroblast",
-	   	 	"lymphocyte of B lineage","macrophage","mature eosinophil","mature neutrophil","megakaryocyte-erythroid progenitor cell","memory B cell","mesenchymal stem cell of the bone marrow","monocyte","mononuclear cell of bone marrow",
-	   	 	"myeloid cell","naive B cell","Neoplastic plasma cell","neutrophilic metamyelocyte","neutrophilic myelocyte","osteoclast","peripheral blood mononuclear cell","plasma cell","regulatory T cell","segmented neutrophil of bone marrow",
-	   	 	"T-cell acute lymphocytic leukemia","unswitched memory B cell"]
-		},
-	   "DISEASE_ONTOLOGY_URI": {
-		   "type": "string",
-		   "enum": ["http://ncimeta.nci.nih.gov/ncimbrowser/ConceptReport.jsp?dictionary=NCI%20MetaThesaurus&code=C0040425","http://ncimeta.nci.nih.gov/ncimbrowser/ConceptReport.jsp?dictionary=NCI%20MetaThesaurus&code=C0026764",
-			   "http://ncimeta.nci.nih.gov/ncimbrowser/ConceptReport.jsp?dictionary=NCI%20MetaThesaurus&code=C0023487","http://ncimeta.nci.nih.gov/ncimbrowser/ConceptReport.jsp?dictionary=NCI%20MetaThesaurus&code=C0023434",
-			   "https://ncimeta.nci.nih.gov/ncimbrowser/ConceptReport.jsp?dictionary=NCI%20MetaThesaurus&code=C1333296","https://ncimeta.nci.nih.gov/ncimbrowser/ConceptReport.jsp?dictionary=NCI%20MetaThesaurus&code=C0023449",
-			   "https://ncimeta.nci.nih.gov/ncimbrowser/ConceptReport.jsp?dictionary=NCI%20MetaThesaurus&code=C0023467","https://ncimeta.nci.nih.gov/ncimbrowser/ConceptReport.jsp?dictionary=NCI%20MetaThesaurus&code=C0023487",
-			   "https://ncimeta.nci.nih.gov/ncimbrowser/ConceptReport.jsp?dictionary=NCI%20MetaThesaurus&code=C0006413","https://ncimeta.nci.nih.gov/ncimbrowser/ConceptReport.jsp?dictionary=NCI%20MetaThesaurus&code=C0023434",
-			   "https://ncimeta.nci.nih.gov/ncimbrowser/ConceptReport.jsp?dictionary=NCI%20MetaThesaurus&code=C1333295","https://ncimeta.nci.nih.gov/ncimbrowser/ConceptReport.jsp?dictionary=NCI%20MetaThesaurus&code=C0023418",
-			   "https://ncimeta.nci.nih.gov/ncimbrowser/ConceptReport.jsp?dictionary=NCI%20MetaThesaurus&code=C0024301","https://ncimeta.nci.nih.gov/ncimbrowser/ConceptReport.jsp?dictionary=NCI%20MetaThesaurus&code=C0334634",
-			   "https://ncimeta.nci.nih.gov/ncimbrowser/ConceptReport.jsp?dictionary=NCI%20MetaThesaurus&code=C0026764","https://ncimeta.nci.nih.gov/ncimbrowser/ConceptReport.jsp?dictionary=NCI%20MetaThesaurus&code=C1336077",
-			   "https://ncimeta.nci.nih.gov/ncimbrowser/ConceptReport.jsp?dictionary=NCI%20MetaThesaurus&code=C0023449","http://ncimeta.nci.nih.gov/ncimbrowser/ConceptReport.jsp?dictionary=NCI%20MetaThesaurus&code=C0023449",
-			   "http://ncimeta.nci.nih.gov/ncimbrowser/ConceptReport.jsp?dictionary=NCI%20MetaThesaurus&code=C0023467",
-			   "NA"
-			   ]
-	   },
-	   "DONOR_AGE": {
-		"type": "string",
-		"pattern": "[0-9]+ - [0-9]+|NA"
-	    },
-	    "DONOR_ETHNICITY": {
-		"type": "string",
-		"enum": ["arab","caucasian","dutch","northern european","NA"]
-	    },
-	    "DONOR_HEALTH_STATUS": {
-		"type": "string",
-		"enum": ["-","Activated B-Cell-Like Diffuse Large B-Cell Lymphoma","Acute lymphocytic leukemia","Acute Myeloid Leukemia","Acute Myeloid Leukemia, POST-MDS",
-			 "Acute Myeloid Leukemia (relapse)","Acute Myeloid Leukemia-relapse","Acute Myeloid Leukemia (Upfront)","Burkitt Lymphoma","Chronic lymphocytic leukemia",
-			 "Germinal Center B-Cell-Like Diffuse Large B-Cell Lymphoma","Healthy","immature TALL","Leukemia","Lymphoma_Follicular","Mantle Cell Lymphoma",
-			 "Multiple myeloma","NA","T-Cell Prolymphocytic Leukemia"]
-	    },
-	    "DONOR_SEX": {
-		"type": "string",
-		"enum": ["Male","Female","Unknown"]
-	    },
-	   "DISEASE": {
-		"type": "string",
-		"enum":  ["Activated B-Cell-Like Diffuse Large B-Cell Lymphoma", "Acute lymphocytic leukemia", "Acute Myeloid Leukemia", "Acute Promyelocytic Leukemia",
-			  "Burkitt Lymphoma", "Chronic Lymphocytic Leukemia", "Germinal Center B-Cell-Like Diffuse Large B-Cell Lymphoma", "leukemia", "Lymphoma_Follicular",
-			  "Mantle Cell Lymphoma", "Mantle cell lymphoma, aggressive", "Plasma Cell Myeloma", "None", "Sporadic Burkitt Lymphoma"]
-	   },
-	   "gender": {
-		   "type": "string",
-		   "enum": ["male","female","unknown"]
-	   },
-	   "LINE": {
-	   	   "type": "string",
-	       "enum":  ["DG-75","BL-2","JVM-2","KARPAS-422","SU-DHL-5","U-266","Z-138"]
-	   },
-	   "MOLECULE": {
-		   "type": "string",
-		   "enum": ["total RNA", "polyA RNA", "cytoplasmic RNA", "nuclear RNA", "genomic DNA", "protein", "other"]
-	   },
-   	   "SEX": {
-		   "type": "string",
-		   "enum": ["Male","Female","Unknown","Mixed"]
-	   },
-	   "TISSUES":{
-		   "type":"string",
-		   "enum": ["bone marrow","Cord blood","liver","lymph node","Thymus","Tonsil","venous blood","Venous blood"]
-	   }
-   }
-}
-	   
-	   
-	   
\ No newline at end of file
diff --git a/json_schemas/Sample.schema.dev.json b/json_schemas/Sample.schema.dev.json
deleted file mode 100644
index cf4788a1..00000000
--- a/json_schemas/Sample.schema.dev.json
+++ /dev/null
@@ -1,246 +0,0 @@
-{
-  "$schema":"http://json-schema.org/draft-04/schema#",
-  "title":"North America address",
-  "description":"Postal addresses for Canada, USA and Mexico",
-
-  "type":"object",
-  "properties":
-  {
-  	"id": {
-  	    "type": "string",
-  	     "minLength": 2
-  	},
-  	"entity_type": {
-  	    "type": "string",
-  	    "enum": ["EXPERIMENT","SAMPLE","RUN","STUDY"]
-	    
-  	},
-    "attributes":
-    {
-      "type":"object",
-      "properties":
-      {
-        "SELECTOR":
-        {
-          "oneOf":
-          [
-            {
-              "properties":
-              {
-				"BIOMATERIAL_PROVIDER":{"$ref":"#/definitions/BIOMATERIAL_PROVIDER"},
-                "BIOMATERIAL_TYPE":{"type":"string", "enum":["Primary Cell"]},
-                "CELL_TYPE": {"$ref":"#/definitions/CELL_TYPE"},
-				"cell_type": {"$ref":"#/definitions/CELL_TYPE"},
-				"DISEASE_ONTOLOGY_URI": {"$ref":"#/definitions/DISEASE_ONTOLOGY_URI"},
-				"DONOR_AGE": {"$ref":"#/definitions/DONOR_AGE"},
-				"DONOR_ETHNICITY": {"$ref":"#/definitions/DONOR_ETHNICITY"},
-				"DONOR_HEALTH_STATUS": {"$ref":"#/definitions/DONOR_HEALTH_STATUS"},
-				"DONOR_ID": {"type": "string"},
-				"DONOR_SEX": {"$ref":"#/definitions/DONOR_SEX"},
-				"gender": {"$ref":"#/definitions/gender"},
-				"MARKERS":{
-					"type":"string",
-					"pattern": "^CD"
-				},
-				"MOLECULE":{"$ref":"#/definitions/MOLECULE"},
-			    "subject_id": {"type": "string"},
-			    "PASSAGE_IF_EXPANDED": {"type": "string"},
-			    "phenotype": {"type": "string"},
-				"SAMPLE_ONTOLOGY_URI": {
-		 		   "type": "string",
-		 		   "pattern": "http://purl.obolibrary.org/obo/CL_+"
-		 	    },
-				"subject_id": {"type": "string"},
-			    "TISSUE_DEPOT": {"type": "string"},
-				"TISSUE_TYPE":{"$ref":"#/definitions/TISSUES"},
-			    "TREATMENT": {"type": "string"}
-              },
-              "additionalProperties":true,
-              "required":["BIOMATERIAL_PROVIDER","BIOMATERIAL_TYPE", "CELL_TYPE", "DISEASE_ONTOLOGY_URI","DONOR_AGE", "DONOR_ETHNICITY","DONOR_HEALTH_STATUS","DONOR_ID","DONOR_SEX","gender","MARKERS","MOLECULE",
-				  "PASSAGE_IF_EXPANDED","SAMPLE_ONTOLOGY_URI","subject_id"]
-            },
-            {
-              "properties":
-              {
-				  "BIOMATERIAL_PROVIDER":{"$ref":"#/definitions/BIOMATERIAL_PROVIDER"},
-                  "BIOMATERIAL_TYPE":{"type":"string", "enum":["Primary Tissue"]},
-				  "COLLECTION_METHOD":{"type":"string"},
-			      "DISEASE_ONTOLOGY_URI": {"$ref":"#/definitions/DISEASE_ONTOLOGY_URI"},
-				  "DONOR_AGE": {"$ref":"#/definitions/DONOR_AGE"},
-				  "DONOR_ETHNICITY": {"$ref":"#/definitions/DONOR_ETHNICITY"},
-				  "DONOR_HEALTH_STATUS": {"$ref":"#/definitions/DONOR_HEALTH_STATUS"},
-				  "DONOR_ID": {"type": "string"},
-				  "DONOR_SEX": {"$ref":"#/definitions/DONOR_SEX"},
-				  "gender": {"$ref":"#/definitions/gender"},
-				  "MOLECULE":{"$ref":"#/definitions/MOLECULE"},
-				  "PASSAGE_IF_EXPANDED": {"type": "string"},
-				  "phenotype": {"type": "string"},
-				  "SAMPLE_ONTOLOGY_URI": {
-					  "type": "string",
-					  "pattern": "http://purl.obolibrary.org/obo/UBERON_+"
-			   	  },
-				  "subject_id": {"type": "string"},
-                  "TISSUE_TYPE":{"$ref":"#/definitions/TISSUES"},
-				  "TISSUE_DEPOT": {"type": "string"},
-				  "TREATMENT": {"type": "string"}
-              },
-              "additionalProperties":true,
-              "required":["BIOMATERIAL_PROVIDER","BIOMATERIAL_TYPE","COLLECTION_METHOD","DISEASE_ONTOLOGY_URI","DONOR_AGE","DONOR_ETHNICITY","DONOR_HEALTH_STATUS","DONOR_ID","DONOR_SEX","gender","MOLECULE",
-				  "PASSAGE_IF_EXPANDED","SAMPLE_ONTOLOGY_URI","subject_id","TISSUE_TYPE"]
-            },
-			{
-				"properties":
-				{
-					"BIOMATERIAL_PROVIDER":{"$ref":"#/definitions/BIOMATERIAL_PROVIDER"},
-					"BIOMATERIAL_TYPE":{"type":"string", "enum":["Cell Line"]},
-    				"DIFFERENTIATION_STAGE": {"type": "string"},
-    				"DIFFERENTIATION_METHOD": {"type": "string"},
-    				"DISEASE": {"$ref":"#/definitions/DISEASE"},
-    				"DISEASE_ONTOLOGY_URI": {"$ref":"#/definitions/DISEASE_ONTOLOGY_URI"},
-    				"LINE": {"$ref":"#/definitions/LINE"},
-    				"LINEAGE": {"type":"string"},
-    				"MEDIUM": {"type":"string"},
-    				"MOLECULE":{"$ref":"#/definitions/MOLECULE"},
-    				"PASSAGE": {"type":"string"},
-    			  	"SAMPLE_ONTOLOGY_URI": {
-    					"type": "string",
-    				  	"pattern": "http://purl.obolibrary.org/obo/UBERON_+"
-    		   	  	},
-    				"SEX": {"$ref":"#/definitions/SEX"}
-				},
-				"additionalProperties":true,
-				"required":["BIOMATERIAL_PROVIDER","BIOMATERIAL_TYPE","DIFFERENTIATION_STAGE","DIFFERENTIATION_METHOD","DISEASE","DISEASE_ONTOLOGY_URI","LINE","LINEAGE","MEDIUM","MOLECULE","PASSAGE",
-							"SAMPLE_ONTOLOGY_URI","SEX"]
-			},
-			{
-				"properties":
-				{
-					"BIOMATERIAL_PROVIDER": {"$ref":"#/definitions/BIOMATERIAL_PROVIDER"},
-					"BIOMATERIAL_TYPE": {"type":"string", "enum":["Primary Cell Culture"]},
-					"CELL_TYPE": {"$ref":"#/definitions/CELL_TYPE"},
-					"CULTURE_CONDITIONS": {"type":"string"},
-					"DISEASE_ONTOLOGY_URI": {"$ref":"#/definitions/DISEASE_ONTOLOGY_URI"},
-					"DISEASE": {"$ref":"#/definitions/DISEASE"},
-					"DONOR_AGE": {"$ref":"#/definitions/DONOR_AGE"},
-					"DONOR_AGE_UNIT": {"$ref":"#/definitions/DONOR_AGE_UNIT"},
-					"DONOR_ETHNICITY": {"$ref":"#/definitions/DONOR_ETHNICITY"},
-					"DONOR_HEALTH_STATUS": {"$ref":"#/definitions/DONOR_HEALTH_STATUS"},
-					"DONOR_ID": {"type": "string"},
-					"DONOR_LIFE_STAGE": {"$ref":"#/definitions/DONOR_LIFE_STAGE"},
-					"DONOR_SEX": {"$ref":"#/definitions/DONOR_SEX"},
-					"MARKERS":{
-						"type":"string",
-						"pattern": "^CD"
-					},
-					"MOLECULE": {"$ref":"#/definitions/MOLECULE"},
-					"PASSAGE_IF_EXPANDED": {"type": "string"},
-					"SAMPLE_ONTOLOGY_URI": {
-    					"type": "string",
-    				  	"pattern": "http://purl.obolibrary.org/obo/CL_+"
-					}
-				},
-				"additionalProperties":true,
-				"required":["BIOMATERIAL_PROVIDER","BIOMATERIAL_TYPE","CELL_TYPE","CULTURE_CONDITIONS","DISEASE_ONTOLOGY_URI","DISEASE","DONOR_AGE","DONOR_AGE_UNIT",
-							"DONOR_ETHNICITY","DONOR_HEALTH_STATUS","DONOR_ID","DONOR_LIFE_STAGE","DONOR_SEX","MARKERS","MOLECULE","SAMPLE_ONTOLOGY_URI"]
-			}
-          ]
-        }
-      },
-      "additionalProperties":false,
-      "required":["SELECTOR"]
-    }
-  },
-   "required": ["id","entity_type","attributes"],
-   
-   "definitions": {
-	   "BIOMATERIAL_PROVIDER": {
-		   "type": "string",
-		   "enum": ["-","Anke Bergmann","Anke Bergmann/ Siebert","DSMZ","Felipe Prosper in collaboration with Jose I. Martin-Subero, University of Navarra","ICGC_Siebert/Bergmann",
-			 "Jose I. Martin-Subero","NCMLS","Nijmegen","Necker's hospital","NIHR Cambridge BioResource","Prof.dr. E. Vellenga, University Medical Centre Groningen - Department of Hematology",
-			 "Prof: Lucia Altucci  (SECONDA UNIVERSITA' di NAPOLI- IT)","Sanquin Amsterdam","Sanquin Blood bank, Nijmegen, the Netherlands","Sanquin_Nijmegen","WP4_Bergmann_Siebert_Martin-Subero"]
-	   },
-	   "CELL_TYPE": {
-		   "type": "string",
-		   "enum": ["-","adult endothelial progenitor cell alternatively","activated macrophage","band form neutrophil","blast forming unit erythroid","naive B cell","CD14-positive, CD16-negative classical monocyte",
-	   		"CD34-negative, CD41-positive, CD42-positive megakaryocyte cell","CD38-negative naive B cell","double-positive, alpha-beta thymocyte", "CD4-positive, alpha-beta T cell", "CD4-positive, alpha-beta thymocyte",
-	   		"CD8-positive, alpha-beta T cell","CD8-positive, alpha-beta thymocyte","central memory CD4-positive, alpha-beta T cell","central memory CD8-positive, alpha-beta T cell","class switched memory B cell",
-	   	 	"colony forming unit erythroid","common lymphoid progenitor","common myeloid progenitor","conventional dendritic cell","CD16-positive, CD56-dim natural killer cell","dendritic cell","effector memory CD4-positive, alpha-beta T cell",
-	   	 	"effector memory CD8-positive, alpha-beta T cell","effector memory CD8-positive, alpha-beta T cell, terminally differentiated","endothelial cell of umbilical vein (proliferating)","endothelial cell of umbilical vein (resting)",
-	   	 	"erythroblast","germinal center B cell","granulocyte monocyte progenitor cell","hematopoietic multipotent progenitor cell","hematopoietic stem cell","inflammatory macrophage","late basophilic and polychromatophilic erythroblast",
-	   	 	"lymphocyte of B lineage","macrophage","mature eosinophil","mature neutrophil","megakaryocyte-erythroid progenitor cell","memory B cell","mesenchymal stem cell of the bone marrow","monocyte","mononuclear cell of bone marrow",
-	   	 	"myeloid cell","naive B cell","Neoplastic plasma cell","neutrophilic metamyelocyte","neutrophilic myelocyte","osteoclast","peripheral blood mononuclear cell","plasma cell","regulatory T cell","segmented neutrophil of bone marrow",
-	   	 	"T-cell acute lymphocytic leukemia","unswitched memory B cell"]
-		},
-	   "DISEASE_ONTOLOGY_URI": {
-		   "type": "string",
-		   "enum": ["http://ncimeta.nci.nih.gov/ncimbrowser/ConceptReport.jsp?dictionary=NCI%20MetaThesaurus&code=C0040425","http://ncimeta.nci.nih.gov/ncimbrowser/ConceptReport.jsp?dictionary=NCI%20MetaThesaurus&code=C0026764",
-			   "http://ncimeta.nci.nih.gov/ncimbrowser/ConceptReport.jsp?dictionary=NCI%20MetaThesaurus&code=C0023487","http://ncimeta.nci.nih.gov/ncimbrowser/ConceptReport.jsp?dictionary=NCI%20MetaThesaurus&code=C0023434",
-			   "https://ncimeta.nci.nih.gov/ncimbrowser/ConceptReport.jsp?dictionary=NCI%20MetaThesaurus&code=C1333296","https://ncimeta.nci.nih.gov/ncimbrowser/ConceptReport.jsp?dictionary=NCI%20MetaThesaurus&code=C0023449",
-			   "https://ncimeta.nci.nih.gov/ncimbrowser/ConceptReport.jsp?dictionary=NCI%20MetaThesaurus&code=C0023467","https://ncimeta.nci.nih.gov/ncimbrowser/ConceptReport.jsp?dictionary=NCI%20MetaThesaurus&code=C0023487",
-			   "https://ncimeta.nci.nih.gov/ncimbrowser/ConceptReport.jsp?dictionary=NCI%20MetaThesaurus&code=C0006413","https://ncimeta.nci.nih.gov/ncimbrowser/ConceptReport.jsp?dictionary=NCI%20MetaThesaurus&code=C0023434",
-			   "https://ncimeta.nci.nih.gov/ncimbrowser/ConceptReport.jsp?dictionary=NCI%20MetaThesaurus&code=C1333295","https://ncimeta.nci.nih.gov/ncimbrowser/ConceptReport.jsp?dictionary=NCI%20MetaThesaurus&code=C0023418",
-			   "https://ncimeta.nci.nih.gov/ncimbrowser/ConceptReport.jsp?dictionary=NCI%20MetaThesaurus&code=C0024301","https://ncimeta.nci.nih.gov/ncimbrowser/ConceptReport.jsp?dictionary=NCI%20MetaThesaurus&code=C0334634",
-			   "https://ncimeta.nci.nih.gov/ncimbrowser/ConceptReport.jsp?dictionary=NCI%20MetaThesaurus&code=C0026764","https://ncimeta.nci.nih.gov/ncimbrowser/ConceptReport.jsp?dictionary=NCI%20MetaThesaurus&code=C1336077",
-			   "https://ncimeta.nci.nih.gov/ncimbrowser/ConceptReport.jsp?dictionary=NCI%20MetaThesaurus&code=C0023449","http://ncimeta.nci.nih.gov/ncimbrowser/ConceptReport.jsp?dictionary=NCI%20MetaThesaurus&code=C0023449",
-			   "http://ncimeta.nci.nih.gov/ncimbrowser/ConceptReport.jsp?dictionary=NCI%20MetaThesaurus&code=C0023467",
-			   "NA"
-			   ]
-	   },
-	   "DONOR_AGE": {
-			"type": "string",
-			"pattern": "[0-9]+ - [0-9]+|NA"
-	    },
-	    "DONOR_AGE_UNIT": {
-			"type": "string",
-			"enum": ["year","month","week","day"]
-	    },
-	    "DONOR_ETHNICITY": {
-			"type": "string",
-			"enum": ["arab","caucasian","dutch","northern european","NA"]
-	    },
-	    "DONOR_HEALTH_STATUS": {
-			"type": "string",
-			"enum": ["-","Activated B-Cell-Like Diffuse Large B-Cell Lymphoma","Acute lymphocytic leukemia","Acute Myeloid Leukemia","Acute Myeloid Leukemia, POST-MDS",
-				 "Acute Myeloid Leukemia (relapse)","Acute Myeloid Leukemia-relapse","Acute Myeloid Leukemia (Upfront)","Burkitt Lymphoma","Chronic lymphocytic leukemia",
-			 	"Germinal Center B-Cell-Like Diffuse Large B-Cell Lymphoma","Healthy","immature TALL","Leukemia","Lymphoma_Follicular","Mantle Cell Lymphoma",
-			 	"Multiple myeloma","NA","T-Cell Prolymphocytic Leukemia"]
-	    },
-		"DONOR_LIFE_STAGE": {
-			"type": "string",
-			"enum": ["fetal","newborn","child","adult","unknown","embryonic","postnatal"]
-		},
-	    "DONOR_SEX": {
-		"type": "string",
-		"enum": ["Male","Female","Unknown","Mixed"]
-	    },
-	   "DISEASE": {
-		"type": "string",
-		"enum":  ["Activated B-Cell-Like Diffuse Large B-Cell Lymphoma", "Acute lymphocytic leukemia", "Acute Myeloid Leukemia", "Acute Promyelocytic Leukemia",
-			  "Burkitt Lymphoma", "Chronic Lymphocytic Leukemia", "Germinal Center B-Cell-Like Diffuse Large B-Cell Lymphoma", "leukemia", "Lymphoma_Follicular",
-			  "Mantle Cell Lymphoma", "Mantle cell lymphoma, aggressive", "Plasma Cell Myeloma", "None", "Sporadic Burkitt Lymphoma"]
-	   },
-	   "gender": {
-		   "type": "string",
-		   "enum": ["male","female","unknown"]
-	   },
-	   "LINE": {
-	   	   "type": "string",
-	       "enum":  ["DG-75","BL-2","JVM-2","KARPAS-422","SU-DHL-5","U-266","Z-138"]
-	   },
-	   "MOLECULE": {
-		   "type": "string",
-		   "enum": ["total RNA", "polyA RNA", "cytoplasmic RNA", "nuclear RNA", "genomic DNA", "protein", "other"]
-	   },
-   	   "SEX": {
-		   "type": "string",
-		   "enum": ["Male","Female","Unknown","Mixed"]
-	   },
-	   "TISSUES":{
-		   "type":"string",
-		   "enum": ["bone marrow","Cord blood","liver","lymph node","Thymus","Tonsil","venous blood","Venous blood"]
-	   }
-   }
-}
-	   
-	   
-	   
\ No newline at end of file
diff --git a/json_schemas/Sample.validonor.json b/json_schemas/Sample.validonor.json
deleted file mode 100644
index c7fb68cc..00000000
--- a/json_schemas/Sample.validonor.json
+++ /dev/null
@@ -1,87 +0,0 @@
-{
-  "$schema":"http://json-schema.org/draft-04/schema#",
-  "title":"North America address",
-  "description":"Postal addresses for Canada, USA and Mexico",
-
-  "type":"object",
-  "properties":
-  {
-  	"id": {
-  	    "type": "string",
-  	     "minLength": 2
-  	},
-  	"entity_type": {
-  	    "type": "string",
-  	    "enum": ["EXPERIMENT","SAMPLE","RUN","STUDY"]
-	    
-  	},
-    "attributes":
-    {
-      "type":"object",
-      "properties":
-      {
-        "SELECTOR":
-        {
-          "oneOf":
-          [
-            {
-              "properties":
-              {
-				"BIOMATERIAL_PROVIDER":{
-					"type":"string",
-					"enum":["Prof: Lucia Altucci  (SECONDA UNIVERSITA' di NAPOLI- IT)"]
-				},
-				"DONOR_ID": {"type": "string","pattern": "^pz [0-9]"}
-				},
-              "additionalProperties":true,
-			  "required":["BIOMATERIAL_PROVIDER","DONOR_ID"]
-            },
-			{
-             "properties":
-             {
-  			   "BIOMATERIAL_PROVIDER":{
-  					"type":"string",
-  					"enum":["NIHR Cambridge BioResource"]
-  				},
-  				"DONOR_ID": {"type": "string", "minLength": 6}
-  				},
-               "additionalProperties":true,
-  			   "required":["BIOMATERIAL_PROVIDER","DONOR_ID"]	
-			},
-			{
-             "properties":
-             {
-  			   "BIOMATERIAL_PROVIDER":{
-  					"type":"string",
-  					"enum":["Prof.dr. E. Vellenga, University Medical Centre Groningen - Department of Hematology"]
-  				},
-  				"DONOR_ID": {
-					"type": "string", 
-					"pattern": "^UMCG|^S|^C",
-					"minLength": 6
-					}
-  				},
-               "additionalProperties":true,
-  			   "required":["BIOMATERIAL_PROVIDER","DONOR_ID"]	
-			}
-          ]
-        }
-      },
-      "additionalProperties":false,
-      "required":["SELECTOR"]
-    }
-  },
-   "required": ["id","entity_type","attributes"],
-   
-   "definitions": {
-	   "BIOMATERIAL_PROVIDER": {
-		   "type": "string",
-		   "enum": ["-","Anke Bergmann","Anke Bergmann/ Siebert","DSMZ","Felipe Prosper in collaboration with Jose I. Martin-Subero, University of Navarra","ICGC_Siebert/Bergmann",
-			 "Jose I. Martin-Subero","NCMLS","Nijmegen","Necker's hospital","NIHR Cambridge BioResource","Prof.dr. E. Vellenga, University Medical Centre Groningen - Department of Hematology",
-			 "Prof: Lucia Altucci  (SECONDA UNIVERSITA' di NAPOLI- IT)","Sanquin Amsterdam","Sanquin Blood bank, Nijmegen, the Netherlands","Sanquin_Nijmegen","WP4_Bergmann_Siebert_Martin-Subero"]
-	   }
-   }
-}
-	   
-	   
-	   
\ No newline at end of file
diff --git a/t/TSVsample_loader.t b/t/TSVsample_loader.t
deleted file mode 100755
index 80b503e9..00000000
--- a/t/TSVsample_loader.t
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-use FindBin qw/$Bin/;
-use lib "$Bin/../lib";
-
-use Bio::Metadata::Loader::TSVLoader;
-use Bio::Metadata::ValidateSchema::EntityValidator;
-use Data::Dumper;
-use Test::More;
-
-my $data_dir = "$Bin/data";
-my $schema_file="$Bin/../json_schemas/Sample.schema.dev.json";
-
-my $loader = Bio::Metadata::Loader::TSVLoader->new();
-
-my $o=$loader->load("$data_dir/TSV/sample.tsv");
-
-isa_ok($o, "Bio::Metadata::Entity");
-
-done_testing();
diff --git a/t/TSVsampleset_loader.t b/t/TSVsampleset_loader.t
deleted file mode 100755
index 054fa807..00000000
--- a/t/TSVsampleset_loader.t
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-use FindBin qw/$Bin/;
-use lib "$Bin/../lib";
-
-use Bio::Metadata::Loader::TSVLoader;
-use Bio::Metadata::ValidateSchema::EntityValidator;
-use Data::Dumper;
-use Test::More;
-
-my $data_dir = "$Bin/data";
-my $schema_file="$Bin/../json_schemas/Sample.schema.dev.json";
-
-my $loader = Bio::Metadata::Loader::TSVLoader->new();
-
-my $o=$loader->load("$data_dir/TSV/sampleset.tsv");
-
-isa_ok($o, "ARRAY");
-
-done_testing();
diff --git a/t/data/TSV/sample.tsv b/t/data/TSV/sample.tsv
deleted file mode 100644
index dbc433db..00000000
--- a/t/data/TSV/sample.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-TYPE	TITLE	ANONYMIZED_NAME	subject_id	DESCRIPTION	MOLECULE	DISEASE	BIOMATERIAL_PROVIDER	BIOMATERIAL_TYPE	CELL_TYPE	TISSUE_TYPE	MARKERS	DONOR_ID	DONOR_AGE	DONOR_HEALTH_STATUS	DONOR_SEX	gender	DONOR_ETHNICITY	PASSAGE_IF_EXPANDED	SAMPLE_ONTOLOGY_URI	DISEASE_ONTOLOGY_URI	TREATMENT	TISSUE_DEPOT	phenotype
-SAMPLE	S01NDF11	T15_15	T15_15	Naive B cells from Healthy Individual	total RNA	None	Jose I. Martin-Subero	Primary Cell	naive B cells	Tonsil	CD19+,CD20+,CD38low,CD23+	T15_15	0-5	NA	Female	female	NA	NA	http://purl.obolibrary.org/obo/CL_0000788	NA	NA	NA	CL_0000788;UBERON_0002372
diff --git a/t/data/TSV/sampleset.tsv b/t/data/TSV/sampleset.tsv
deleted file mode 100644
index dfb6b452..00000000
--- a/t/data/TSV/sampleset.tsv
+++ /dev/null
@@ -1,3 +0,0 @@
-TYPE	TITLE	ANONYMIZED_NAME	subject_id	DESCRIPTION	MOLECULE	DISEASE	BIOMATERIAL_PROVIDER	BIOMATERIAL_TYPE	CELL_TYPE	TISSUE_TYPE	MARKERS	DONOR_ID	DONOR_AGE	DONOR_HEALTH_STATUS	DONOR_SEX	gender	DONOR_ETHNICITY	PASSAGE_IF_EXPANDED	SAMPLE_ONTOLOGY_URI	DISEASE_ONTOLOGY_URI	TREATMENT	TISSUE_DEPOT	phenotype
-SAMPLE	S01NDF11	T15_15	T15_15	Naive B cells from Healthy Individual	total RNA	None	Jose I. Martin-Subero	Primary Cell	naive B cells	Tonsil	CD19+,CD20+,CD38low,CD23+	T15_15	0-5	NA	Female	female	NA	NA	http://purl.obolibrary.org/obo/CL_0000788	NA	NA	NA	CL_0000788;UBERON_0002372
-SAMPLE	S01GAZ11	T15_10	T15_10	Naive B cells from Healthy Individual	genomic DNA	None	Jose I. Martin-Subero	Primary Cell	naive B cells	Tonsil	CD19+,CD20+,CD38low,CD23+	T15_10	10-15	NA	Male	male	NA	NA	http://purl.obolibrary.org/obo/CL_0000788	NA	NA	NA	CL_0000788;UBERON_0002372
diff --git a/t/validate_xml_experiment.t b/t/validate_xml_experiment.t
deleted file mode 100755
index fd71a6e6..00000000
--- a/t/validate_xml_experiment.t
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-use FindBin qw/$Bin/;
-use lib "$Bin/../lib";
-use lib "$Bin/../lib/json-validator/lib";
-
-use JSON;
-use Data::Dumper;
-use Bio::Metadata::Loader::XMLExperimentLoader;
-use Bio::Metadata::ValidateSchema::EntityValidator;
-use Test::More;
-
-my $data_dir = "$Bin/data";
-my $schema_file="$Bin/../json_schemas/Experiment.schema.dev.json";
-
-my $loader = Bio::Metadata::Loader::XMLExperimentLoader->new();
-
-my $o=$loader->load("$data_dir/XML/experiment_good.xml");
-
-isa_ok($o, "ARRAY");
-
-my $validator = Bio::Metadata::ValidateSchema::EntityValidator->new(
-								    'schema' => $schema_file,
-								    'entity' => $o
-								   );
-
-isa_ok($validator, "Bio::Metadata::ValidateSchema::EntityValidator");
-
-my ( $outcome_overall, $outcomes )=$validator->validate($o);
-
-is( $outcome_overall, 'pass', 'pass outcome expected' );
-
-done_testing();
-
diff --git a/t/validate_xml_experimentset.t b/t/validate_xml_experimentset.t
deleted file mode 100755
index befa7710..00000000
--- a/t/validate_xml_experimentset.t
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-use FindBin qw/$Bin/;
-use lib "$Bin/../lib";
-use lib "$Bin/../lib/json-validator/lib";
-
-use JSON;
-use Data::Dumper;
-
-use Bio::Metadata::Loader::XMLExperimentLoader;
-use Bio::Metadata::ValidateSchema::EntityValidator;
-use Test::More;
-use Bio::Metadata::Reporter::ExcelReporter;
-
-my $data_dir = "$Bin/data";
-my $schema_file="$Bin/../json_schemas/Experiment.schema.dev.json";
-
-my $output = "test_out.experimentset.bad.xlsx";
-
-my $loader = Bio::Metadata::Loader::XMLExperimentLoader->new();
-
-my $o=$loader->load("$data_dir/XML/experimentset_bad.xml");
-
-isa_ok($o, "ARRAY");
-
-my $validator = Bio::Metadata::ValidateSchema::EntityValidator->new(
-								    'schema' => $schema_file,
-								    'entityarray' => $o
-								   );
-
-isa_ok($validator, "Bio::Metadata::ValidateSchema::EntityValidator");
-
-my ( $entity_status, $entity_outcomes, $attribute_status, $attribute_outcomes )=$validator->validate_all($o);
-
-my $reporter = Bio::Metadata::Reporter::ExcelReporter->new( file_path => $output );
-
-$reporter->report(
-    entities           => $o,
-    entity_status      => $entity_status,
-    entity_outcomes    => $entity_outcomes,
-    attribute_status   => $attribute_status,
-    attribute_outcomes => $attribute_outcomes
-);
-
-done_testing();
-
diff --git a/t/validate_xml_root.t b/t/validate_xml_root.t
deleted file mode 100755
index 0a0213e8..00000000
--- a/t/validate_xml_root.t
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-use FindBin qw/$Bin/;
-use lib "$Bin/../lib";
-use lib "$Bin/../lib/json-validator/lib";
-
-use JSON;
-use Data::Dumper;
-use Bio::Metadata::Loader::XMLExperimentLoader;
-use Bio::Metadata::ValidateSchema::EntityValidator;
-use Test::More;
-
-my $data_dir = "$Bin/data";
-my $schema_file="$Bin/../json_schemas/Experiment.schema.dev.json";
-
-my $loader = Bio::Metadata::Loader::XMLExperimentLoader->new();
-
-my $o=$loader->load("$data_dir/XML/experiment_good_noroot.xml");
-
-isa_ok($o, "ARRAY");
-
-my $validator = Bio::Metadata::ValidateSchema::EntityValidator->new(
-                    'schema' => $schema_file,
-                    'entity' => $o
-                   );
-
-isa_ok($validator, "Bio::Metadata::ValidateSchema::EntityValidator");
-
-my ( $outcome_overall, $outcomes )=$validator->validate($o);
-
-is( $outcome_overall, 'pass', 'pass outcome expected' );
-
-done_testing();
-
diff --git a/t/validate_xml_sample.bad.t b/t/validate_xml_sample.bad.t
deleted file mode 100755
index 7880cd9c..00000000
--- a/t/validate_xml_sample.bad.t
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-use FindBin qw/$Bin/;
-use lib "$Bin/../lib";
-use lib "$Bin/../lib/json-validator/lib";
-
-use Bio::Metadata::Loader::XMLSampleLoader;
-use Bio::Metadata::ValidateSchema::EntityValidator;
-use JSON;
-use Data::Dumper;
-use Test::More;
-use Bio::Metadata::Reporter::ExcelReporter;
-
-my $data_dir = "$Bin/data";
-my $schema_file="$Bin/../json_schemas/Sample.schema.dev.json";
-
-my $loader = Bio::Metadata::Loader::XMLSampleLoader->new();
-
-my $o=$loader->load("$data_dir/XML/sample_bad.xml");
-
-isa_ok($o, "ARRAY");
-
-my $validator = Bio::Metadata::ValidateSchema::EntityValidator->new(
-    'schema' => $schema_file,
-    'entity' => $o,
-    'selector' => "BIOMATERIAL_TYPE"
-);
-
-isa_ok($validator, "Bio::Metadata::ValidateSchema::EntityValidator");
-
-my ( $outcome_overall, $outcomes )=$validator->validate($o);
-
-is( $outcome_overall, 'error', 'error outcome expected' );
-
-done_testing();
diff --git a/t/validate_xml_sample.good.t b/t/validate_xml_sample.good.t
deleted file mode 100755
index 115057e4..00000000
--- a/t/validate_xml_sample.good.t
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-use FindBin qw/$Bin/;
-use lib "$Bin/../lib";
-use lib "$Bin/../lib/json-validator/lib";
-
-use Bio::Metadata::Loader::XMLSampleLoader;
-use Bio::Metadata::ValidateSchema::EntityValidator;
-use JSON;
-use Data::Dumper;
-use Test::More;
-use Bio::Metadata::Reporter::ExcelReporter;
-
-my $data_dir = "$Bin/data";
-my $schema_file="$Bin/../json_schemas/Sample.schema.dev.json";
-
-my $loader = Bio::Metadata::Loader::XMLSampleLoader->new();
-
-my $o=$loader->load("$data_dir/XML/sample_good.xml");
-
-isa_ok($o, "ARRAY");
-
-my $validator = Bio::Metadata::ValidateSchema::EntityValidator->new(
-								    'schema' => $schema_file,
-								    'entity' => $o,
-									'selector' => "BIOMATERIAL_TYPE"
-								   );
-
-isa_ok($validator, "Bio::Metadata::ValidateSchema::EntityValidator");
-
-my ( $outcome_overall, $outcomes )=$validator->validate($o);
-
-is( $outcome_overall, 'pass', 'pass outcome expected' );
-
-done_testing();
diff --git a/t/validate_xml_sampleset.bad.t b/t/validate_xml_sampleset.bad.t
deleted file mode 100755
index a90e7206..00000000
--- a/t/validate_xml_sampleset.bad.t
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-use FindBin qw/$Bin/;
-use lib "$Bin/../lib";
-use lib "$Bin/../lib/json-validator/lib";
-
-use Bio::Metadata::Loader::XMLSampleLoader;
-use Bio::Metadata::ValidateSchema::EntityValidator;
-use JSON;
-use Data::Dumper;
-use Test::More;
-use Bio::Metadata::Reporter::ExcelReporter;
-
-my $data_dir = "$Bin/data";
-my $schema_file="$Bin/../json_schemas/Sample.schema.dev.json";
-
-my $output = "test_out.sampleset.bad.xlsx";
-
-my $loader = Bio::Metadata::Loader::XMLSampleLoader->new();
-
-my $o=$loader->load("$data_dir/XML/sampleset_bad.xml");
-
-isa_ok($o, "ARRAY");
-
-my $validator = Bio::Metadata::ValidateSchema::EntityValidator->new(
-								    'schema' => $schema_file,
-								    'entityarray' => $o,
-									'selector' => 'BIOMATERIAL_TYPE'
-								   );
-
-isa_ok($validator, "Bio::Metadata::ValidateSchema::EntityValidator");
-
-my ( $entity_status, $entity_outcomes, $attribute_status, $attribute_outcomes )=$validator->validate_all($o);
-
-my $reporter = Bio::Metadata::Reporter::ExcelReporter->new( file_path => $output );
-
-$reporter->report(
-    entities           => $o,
-    entity_status      => $entity_status,
-    entity_outcomes    => $entity_outcomes,
-    attribute_status   => $attribute_status,
-    attribute_outcomes => $attribute_outcomes
-);
-
-done_testing();
diff --git a/t/validate_xml_sampleset.good.t b/t/validate_xml_sampleset.good.t
deleted file mode 100755
index a811fc40..00000000
--- a/t/validate_xml_sampleset.good.t
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-use FindBin qw/$Bin/;
-use lib "$Bin/../lib";
-use lib "$Bin/../lib/json-validator/lib";
-
-use Bio::Metadata::Loader::XMLSampleLoader;
-use Bio::Metadata::ValidateSchema::EntityValidator;
-use JSON;
-use Data::Dumper;
-use Test::More;
-use Bio::Metadata::Reporter::ExcelReporter;
-
-my $data_dir = "$Bin/data";
-my $schema_file="$Bin/../json_schemas/Sample.schema.dev.json";
-
-my $output = "test_out.sampleset.good.xlsx";
-
-my $loader = Bio::Metadata::Loader::XMLSampleLoader->new();
-
-my $o=$loader->load("$data_dir/XML/sampleset_good.xml");
-
-isa_ok($o, "ARRAY");
-
-my $validator = Bio::Metadata::ValidateSchema::EntityValidator->new(
-								    'schema' => $schema_file,
-								    'entityarray' => $o,
-									'selector' => 'BIOMATERIAL_TYPE'
-								   );
-
-isa_ok($validator, "Bio::Metadata::ValidateSchema::EntityValidator");
-
-my ( $entity_status, $entity_outcomes, $attribute_status, $attribute_outcomes )=$validator->validate_all($o);
-
-my $reporter = Bio::Metadata::Reporter::ExcelReporter->new( file_path => $output );
-
-$reporter->report(
-    entities           => $o,
-    entity_status      => $entity_status,
-    entity_outcomes    => $entity_outcomes,
-    attribute_status   => $attribute_status,
-    attribute_outcomes => $attribute_outcomes
-);
-
-
-
-
-
-done_testing();