diff --git a/201-vm-domain-join/azuredeploy.json b/201-vm-domain-join/azuredeploy.json
index 32b6018744bc..298818d5b86f 100644
--- a/201-vm-domain-join/azuredeploy.json
+++ b/201-vm-domain-join/azuredeploy.json
@@ -49,7 +49,7 @@
       "type": "string",
       "defaultValue": "",
       "metadata": {
-        "description": "Specifies an organizational unit (OU) for the domain account. Enter the full distinguished name of the OU in quotation marks. Example: "OU=testOU; DC=domain; DC=Domain; DC=com""
+        "description": "Specifies an organizational unit (OU) for the domain account. Enter the full distinguished name of the OU in quotation marks. Example: \"OU=testOU; DC=domain; DC=Domain; DC=com\""
       }
     },
     "domainJoinOptions": {
@@ -77,7 +77,6 @@
     "imagePublisher": "MicrosoftWindowsServer",
     "imageOffer": "WindowsServer",
     "windowsOSVersion": "2016-Datacenter",
-    "apiVersion": "2015-06-15",
     "nicName": "[concat(parameters('dnsLabelPrefix'),'Nic')]",
     "publicIPName": "[concat(parameters('dnsLabelPrefix'),'Pip')]",
     "vnetID": "[resourceId(resourceGroup().name, 'Microsoft.Network/virtualNetworks', parameters('existingVNETName'))]",
diff --git a/201-vmss-internal-loadbalancer/azuredeploy.json b/201-vmss-internal-loadbalancer/azuredeploy.json
index 2a840ff4df92..d284d07302b9 100644
--- a/201-vmss-internal-loadbalancer/azuredeploy.json
+++ b/201-vmss-internal-loadbalancer/azuredeploy.json
@@ -65,9 +65,7 @@
     "subnetName": "[concat(variables('namingInfix'), 'subnet')]",
     "subnetRef": "[concat(variables('vnetID'),'/subnets/',variables('subnetName'))]",
     "publicIPAddressName": "[concat(variables('namingInfix'), 'pip')]",
-    "jumpboxName": "[concat(variables('namingInfix'), 'vm')]",
     "loadBalancerName": "[concat(variables('namingInfix'), 'lb')]",
-    "publicIPAddressID": "[resourceId('Microsoft.Network/publicIPAddresses',variables('publicIPAddressName'))]",
     "lbID": "[resourceId('Microsoft.Network/loadBalancers',variables('loadBalancerName'))]",
     "natPoolName": "[concat(variables('namingInfix'), 'natpool')]",
     "bePoolName": "[concat(variables('namingInfix'), 'bepool')]",
diff --git a/301-custom-images-at-scale/azuredeploy.json b/301-custom-images-at-scale/azuredeploy.json
index 792e157ddd0a..6ff8d5221333 100644
--- a/301-custom-images-at-scale/azuredeploy.json
+++ b/301-custom-images-at-scale/azuredeploy.json
@@ -134,7 +134,6 @@
     "addressPrefix": "10.0.0.0/16",
     "subnetName": "subnet",
     "subnetPrefix": "10.0.0.0/21",
-    "storageAccountType": "Standard_LRS",
     "transferImagePublisher": "Canonical",
     "transferImageOffer": "UbuntuServer",
     "ubuntuOSVersion": "15.10",
@@ -144,7 +143,6 @@
     "templateLocation": "https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/301-custom-images-at-scale/",
 
     "sharedResourcesTemplateUri ": "[concat(variables('templateLocation'), 'shared-resources.json')]",
-    "uploadTemplateUri": "[concat(variables('templateLocation'), 'upload.json')]",
     "finalTemplateUri": "[concat(variables('templateLocation'), 'final_')]",
 
     "downloadTemplateURI": "[concat(variables('templateLocation'), 'download.json')]",
diff --git a/cloudbeesjenkins-dockerdatacenter/azuredeploy.json b/cloudbeesjenkins-dockerdatacenter/azuredeploy.json
index f98bd8ef9ad3..d381bb0ddae7 100755
--- a/cloudbeesjenkins-dockerdatacenter/azuredeploy.json
+++ b/cloudbeesjenkins-dockerdatacenter/azuredeploy.json
@@ -133,7 +133,6 @@
     }
   },
   "variables": {
-    "deploymentApiVersion": "2015-01-01",
     "networkApiVersion": "2015-06-15",
     "storageAccountNameCloudbees": "[concat('cbstor',variables('uniqueString'))]",
     "storageAccountType": "Standard_LRS",
@@ -141,7 +140,6 @@
     "virtualNetworkAddressPrefix": "10.0.0.0/16",
     "jenkinsSubnetName": "jenkins-subnet",
     "jenkinsSubnetPrefix": "10.0.0.0/24",
-    "JenkinsdnsNameForPublicIP": "jenkins-0-",
     "ucpControllerSubnetName": "ucp-controller-subnet",
     "ucpControllerSubnetPrefix": "10.0.1.0/24",
     "ucpdtrNodeSubnetName": "ucp-node-subnet",
@@ -239,7 +237,7 @@
       "name": "cloudbeesDeployment",
       "type": "Microsoft.Resources/deployments",
       "dependsOn": [
-        "['Microsoft.Resources/deployments/virtualNetworkDeployment']"
+        "Microsoft.Resources/deployments/virtualNetworkDeployment"
       ],
       "properties": {
         "mode": "Incremental",
@@ -310,7 +308,7 @@
       "name": "dockerDatacenterDeployment",
       "type": "Microsoft.Resources/deployments",
       "dependsOn": [
-        "['Microsoft.Resources/deployments/virtualNetworkDeployment']"
+        "Microsoft.Resources/deployments/virtualNetworkDeployment"
       ],
       "properties": {
         "mode": "Incremental",
diff --git a/sql-server-2014-alwayson-existing-vnet-and-ad/nested/deploy-sql-cluster.json b/sql-server-2014-alwayson-existing-vnet-and-ad/nested/deploy-sql-cluster.json
index 24323fbc69d4..0285e022c32d 100644
--- a/sql-server-2014-alwayson-existing-vnet-and-ad/nested/deploy-sql-cluster.json
+++ b/sql-server-2014-alwayson-existing-vnet-and-ad/nested/deploy-sql-cluster.json
@@ -71,10 +71,9 @@
 		"sqlNamePrefix": "[concat(parameters('namePrefix'),'-sql-')]",
 		"sqlAvailabilitySetName": "[concat(variables('sqlNamePrefix'),'as')]",
 		"sqlLBName": "[concat(variables('sqlNamePrefix'),'ilb')]",
-		"sqllbID": "[resourceId('Microsoft.Network/loadBalancers',variables('sqlLBName'))]",
+		"sqlLBId": "[resourceId('Microsoft.Network/loadBalancers',variables('sqlLBName'))]",
 		"lbFE1": "[concat(variables('sqlNamePrefix'),'ilbfe1')]",
 		"lbBE": "[concat(variables('sqlNamePrefix'),'ilbbe')]",
-		"sqlLBID": "[resourceId('Microsoft.Network/loadBalancers',variables('sqlLBName'))]",
 		"sqlLBFEConfigID1": "[concat(variables('sqllbID'),'/frontendIPConfigurations/',variables('lbFE1'))]",
 		"sqlLBBEAddressPoolID": "[concat(variables('sqllbID'),'/backendAddressPools/',variables('lbBE'))]",
 		"sqlAOProbe1": "[concat(variables('sqlNamePrefix'),'ilbp1')]",
diff --git a/zabbix-monitoring-cluster/nested/monitoringServerDistroCentOS.json b/zabbix-monitoring-cluster/nested/monitoringServerDistroCentOS.json
index f78274588a96..047db20e9915 100644
--- a/zabbix-monitoring-cluster/nested/monitoringServerDistroCentOS.json
+++ b/zabbix-monitoring-cluster/nested/monitoringServerDistroCentOS.json
@@ -1,6 +1,7 @@
 {
   "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
   "contentVersion": "1.0.0.0",
+  "parameters": {},
   "resources": [],
   "outputs": {
     "imageReference": {
diff --git a/zabbix-monitoring-cluster/nested/monitoringServerDistroUbuntu.json b/zabbix-monitoring-cluster/nested/monitoringServerDistroUbuntu.json
index 0fa6695a6468..8bdf881442b6 100644
--- a/zabbix-monitoring-cluster/nested/monitoringServerDistroUbuntu.json
+++ b/zabbix-monitoring-cluster/nested/monitoringServerDistroUbuntu.json
@@ -1,6 +1,7 @@
 {
   "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
   "contentVersion": "1.0.0.0",
+  "parameters": {},
   "resources": [],
   "outputs": {
     "imageReference": {