diff --git a/configuration/ampathforms/HIV_Green_Card.json b/configuration/ampathforms/HIV_Green_Card.json
index 4094eee8..97baea86 100644
--- a/configuration/ampathforms/HIV_Green_Card.json
+++ b/configuration/ampathforms/HIV_Green_Card.json
@@ -117,280 +117,6 @@
 						}
 					]
 				},
-				{
-					"label": "Vital Signs",
-					"isExpanded": "true",
-					"questions": [
-						{
-							"label": "Temperature",
-							"type": "obs",
-							"id": "temp",
-							"questionOptions": {
-								"concept": "5088AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-								"rendering": "number",
-								"max": "43",
-								"min": "25"
-							},
-							"hide": {
-								"hideWhenExpression": "isEmpty(personPresent) || personPresent !== '978AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
-							}
-						},
-						{
-							"label": "Pulse Rate",
-							"type": "obs",
-							"id": "pulse",
-							"questionOptions": {
-								"concept": "5087AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-								"rendering": "number",
-								"max": "230",
-								"min": "0",
-								"conceptMappings": [
-									{
-										"type": "MCL/CIEL",
-										"value": "5087"
-									},
-									{
-										"type": "local",
-										"value": "5087"
-									}
-								]
-							},
-							"hide": {
-								"hideWhenExpression": "isEmpty(personPresent) || personPresent !== '978AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
-							},
-							"historicalExpression": "_.isEmpty(HD.getObject('prevEnc').getValue('5087AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA')) ? undefined : HD.getObject('prevEnc').getValue('5087AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA')"
-						},
-						{
-							"label": "Systolic BP",
-							"type": "obs",
-							"id": "systolic",
-							"questionOptions": {
-								"concept": "5085AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-								"rendering": "number",
-								"min": "0",
-								"conceptMappings": [
-									{
-										"type": "MCL/CIEL",
-										"value": "5085"
-									},
-									{
-										"type": "local",
-										"value": "5085"
-									}
-								]
-							},
-							"hide": {
-								"hideWhenExpression": "isEmpty(personPresent) || personPresent !== '978AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
-							},
-							"historicalExpression": "_.isEmpty(HD.getObject('prevEnc').getValue('5085AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA')) ? undefined : HD.getObject('prevEnc').getValue('5085AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA')"
-						},
-						{
-							"label": "Diastolic BP",
-							"type": "obs",
-							"id": "diastolic",
-							"questionOptions": {
-								"concept": "5086AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-								"rendering": "number",
-								"min": "0",
-								"conceptMappings": [
-									{
-										"type": "MCL/CIEL",
-										"value": "5086"
-									},
-									{
-										"type": "local",
-										"value": "5086"
-									}
-								]
-							},
-							"hide": {
-								"hideWhenExpression": "isEmpty(personPresent) || personPresent !== '978AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
-							},
-							"historicalExpression": "_.isEmpty(HD.getObject('prevEnc').getValue('5086AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA')) ? undefined : HD.getObject('prevEnc').getValue('5086AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA')"
-						},
-						{
-							"label": "Respiratory Rate",
-							"type": "obs",
-							"id": "resp",
-							"questionOptions": {
-								"concept": "5242AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-								"rendering": "number",
-								"max": "99",
-								"min": "0",
-								"conceptMappings": [
-									{
-										"type": "local",
-										"value": "5242"
-									},
-									{
-										"type": "MCL/CIEL",
-										"value": "5242"
-									}
-								]
-							},
-							"hide": {
-								"hideWhenExpression": "isEmpty(personPresent) || personPresent !== '978AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
-							}
-						},
-						{
-							"label": "Oxygen Saturation",
-							"type": "obs",
-							"id": "oxygen",
-							"questionOptions": {
-								"concept": "5092AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-								"rendering": "number",
-								"max": "100",
-								"min": "0",
-								"conceptMappings": [
-									{
-										"type": "local",
-										"value": "5092"
-									},
-									{
-										"type": "MCL/CIEL",
-										"value": "5092"
-									}
-								]
-							},
-							"hide": {
-								"hideWhenExpression": "isEmpty(personPresent) || personPresent !== '978AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
-							}
-						},
-						{
-							"label": "Weight(Kg)",
-							"type": "obs",
-							"id": "weight",
-							"required": "true",
-							"questionOptions": {
-								"concept": "5089AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-								"rendering": "number",
-								"max": "250",
-								"min": "0",
-								"conceptMappings": [
-									{
-										"type": "local",
-										"value": "5089"
-									},
-									{
-										"type": "MCL/CIEL",
-										"value": "5089"
-									}
-								]
-							},
-							"hide": {
-								"hideWhenExpression": "isEmpty(personPresent) || personPresent !== '978AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
-							},
-							"historicalExpression": "_.isEmpty(HD.getObject('prevEnc').getValue('5089AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA')) ? undefined : HD.getObject('prevEnc').getValue('5089AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA')"
-						},
-						{
-							"label": "Height",
-							"type": "obs",
-							"questionOptions": {
-								"rendering": "number",
-								"concept": "5090AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-								"max": "250",
-								"min": "0",
-								"showDate": "false",
-								"conceptMappings": [
-									{
-										"type": "LOINC",
-										"value": "8302-2"
-									},
-									{
-										"type": "SNOMED CT",
-										"value": "CT: 50373000"
-									},
-									{
-										"type": "AMPATH",
-										"value": "5090"
-									},
-									{
-										"type": "PIH Malawi",
-										"value": "Malawi: 5090"
-									},
-									{
-										"type": "CIEL",
-										"value": "5090"
-									},
-									{
-										"type": "PIH",
-										"value": "5090"
-									}
-								]
-							},
-							"id": "height",
-							"required": "true",
-							"hide": {
-								"hideWhenExpression": "isEmpty(personPresent) || personPresent !== '978AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
-							},
-							"historicalExpression": "_.isEmpty(HD.getObject('prevEnc').getValue('5090AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA')) ? undefined : HD.getObject('prevEnc').getValue('5090AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA')"
-						},
-						{
-							"label": "BMI",
-							"type": "obs",
-							"questionOptions": {
-								"rendering": "number",
-								"concept": "1342AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-								"max": "100",
-								"min": "0",
-								"calculate": {
-									"calculateExpression": "calcBMI(height,weight)"
-								}
-							},
-							"id": "bMi",
-							"hide": {
-								"hideWhenExpression": "isEmpty(personPresent) || personPresent !== '978AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
-							}
-						},
-						{
-							"label": "MUAC",
-							"type": "obs",
-							"questionOptions": {
-								"rendering": "number",
-								"concept": "1343AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-								"max": "250",
-								"min": "0"
-							},
-							"id": "mUaC",
-							"hide": {
-								"hideWhenExpression": "isEmpty(personPresent) || personPresent !== '978AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || age < 5 || age > 6 || sex !== 'F'"
-							}
-						},
-						{
-							"label": "Nutritional status",
-							"type": "obs",
-							"id": "nutRitionalStatus",
-							"questionOptions": {
-								"concept": "163300AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-								"rendering": "select",
-								"calculate": {
-									"calculateExpression": "parseInt(bMi) <= 16 ? '163302AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' : parseInt(bMi) >= 16 && parseInt(bMi) <= 18 ? '163303AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' : parseInt(bMi) >= 18 && parseInt(bMi) <= 24 ? '1115AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' : parseInt(bMi) >= 25 ? '114413AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' :''"
-								},
-								"answers": [
-									{
-										"concept": "163303AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-										"label": "Moderate acute malnutrition"
-									},
-									{
-										"concept": "114413AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-										"label": "Overweight/Obese"
-									},
-									{
-										"concept": "163302AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-										"label": "Severe acute malnutrition"
-									},
-									{
-										"concept": "1115AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-										"label": "Normal"
-									}
-								]
-							},
-							"hide": {
-								"hideWhenExpression": "isEmpty(personPresent) || personPresent !== '978AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
-							}
-						}
-					]
-				},
 				{
 					"label": "Population Type",
 					"isExpanded": "true",