diff --git a/e2e/data/LoopWithBranch.graph b/e2e/data/LoopWithBranch.graph
index fa066b43..e32bbfd0 100644
--- a/e2e/data/LoopWithBranch.graph
+++ b/e2e/data/LoopWithBranch.graph
@@ -197,7 +197,6 @@
             "drawOrderHint": 0,
             "fields": [
                 {
-                    "defaultValue": "false",
                     "description": "Specifies whether this data component contains data that should not be deleted after execution",
                     "encoding": "pickle",
                     "id": "81ac13b6-6d48-49fd-b661-9c60b5479a92",
@@ -212,7 +211,6 @@
                     "value": false
                 },
                 {
-                    "defaultValue": "false",
                     "description": "Specifies whether this data component streams input and output data",
                     "encoding": "pickle",
                     "id": "442e9bb2-712b-4a12-b13f-331797a9f14a",
@@ -227,7 +225,6 @@
                     "value": false
                 },
                 {
-                    "defaultValue": "1",
                     "description": "",
                     "encoding": "pickle",
                     "id": "06a01138-3c97-4455-b8ba-33692e806262",
@@ -273,7 +270,6 @@
             "drawOrderHint": 0,
             "fields": [
                 {
-                    "defaultValue": "false",
                     "description": "Specifies whether this data component contains data that should not be deleted after execution",
                     "encoding": "pickle",
                     "id": "c19c21c5-720e-4479-9539-510c25173c28",
@@ -288,7 +284,6 @@
                     "value": false
                 },
                 {
-                    "defaultValue": "false",
                     "description": "Specifies whether this data component streams input and output data",
                     "encoding": "pickle",
                     "id": "793e8c74-6788-48cc-9e8e-9639e55538f3",
@@ -303,7 +298,6 @@
                     "value": false
                 },
                 {
-                    "defaultValue": "0",
                     "description": "Estimate of execution time (in seconds) for this application.",
                     "encoding": "pickle",
                     "id": "a6e9b6ac-1d10-4d7a-8f48-c237307248ae",
@@ -318,7 +312,6 @@
                     "value": 5
                 },
                 {
-                    "defaultValue": "0",
                     "description": "Number of CPUs used for this application.",
                     "encoding": "pickle",
                     "id": "7277f675-1944-40eb-a5a8-975a2585bf15",
@@ -333,7 +326,6 @@
                     "value": 1
                 },
                 {
-                    "defaultValue": "false",
                     "description": "Is this node the start of a group?",
                     "encoding": "pickle",
                     "id": "b6023fc5-2692-4933-973c-2f6d98210b57",
@@ -348,7 +340,6 @@
                     "value": false
                 },
                 {
-                    "defaultValue": "",
                     "description": "The python class that implements this application",
                     "encoding": "pickle",
                     "id": "8ecdd652-1c5b-47ca-bd2a-f6bab3446cac",
@@ -363,7 +354,6 @@
                     "value": "dlg.apps.simple.SleepApp"
                 },
                 {
-                    "defaultValue": "",
                     "description": "",
                     "encoding": "pickle",
                     "id": "adca4562-2239-4100-a31c-d784ed5c56d4",
@@ -378,7 +368,6 @@
                     "value": ""
                 },
                 {
-                    "defaultValue": "",
                     "description": "",
                     "encoding": "pickle",
                     "id": "66d8030d-85e5-4489-ab31-bc0be6fe0acf",
@@ -393,7 +382,6 @@
                     "value": ""
                 },
                 {
-                    "defaultValue": "5",
                     "description": "",
                     "encoding": "pickle",
                     "id": "8c0bf11e-f5cb-4ece-9f6b-29cac3a4de74",
@@ -408,7 +396,6 @@
                     "value": 5
                 },
                 {
-                    "defaultValue": "1",
                     "description": "",
                     "encoding": "pickle",
                     "id": "d9f56aa4-8cec-4435-9b4c-701155f214a5",
@@ -423,7 +410,6 @@
                     "value": 1
                 },
                 {
-                    "defaultValue": "def func_name(args): return args",
                     "description": "Python function code",
                     "encoding": "pickle",
                     "id": "3a0ba670-6e94-4762-b48b-227e72e28048",
@@ -438,7 +424,6 @@
                     "value": ""
                 },
                 {
-                    "defaultValue": "func_name",
                     "description": "Python function name",
                     "encoding": "pickle",
                     "id": "ad336a6d-9f36-4e81-a283-9ab1134a457c",
@@ -485,7 +470,6 @@
             "drawOrderHint": 0,
             "fields": [
                 {
-                    "defaultValue": "100",
                     "description": "The size of the array",
                     "encoding": "pickle",
                     "id": "0f875278-1ea6-4eaa-ae5b-ba5745ff2e6d",
@@ -500,7 +484,6 @@
                     "value": 10
                 },
                 {
-                    "defaultValue": "0",
                     "description": "Low value of range in array [inclusive]",
                     "encoding": "pickle",
                     "id": "03c4c994-b720-4484-9037-41245a5ace3b",
@@ -515,7 +498,6 @@
                     "value": 0
                 },
                 {
-                    "defaultValue": "1",
                     "description": "High value of range of array [exclusive]",
                     "encoding": "pickle",
                     "id": "9424b089-c307-4366-b085-b2f6c47bcd39",
@@ -530,7 +512,6 @@
                     "value": 1
                 },
                 {
-                    "defaultValue": "True",
                     "description": "Generate integer array?",
                     "encoding": "pickle",
                     "id": "68435e7d-a179-4ffa-b3c4-b719f8501feb",
@@ -545,7 +526,6 @@
                     "value": false
                 },
                 {
-                    "defaultValue": "dlg.apps.simple.RandomArrayApp",
                     "description": "Application class",
                     "encoding": "pickle",
                     "id": "f7a18a0e-21d2-4c6c-b7d6-50a2aedf9e67",
@@ -560,7 +540,6 @@
                     "value": "dlg.apps.simple.RandomArrayApp"
                 },
                 {
-                    "defaultValue": "simple",
                     "description": "Base name of application class",
                     "encoding": "pickle",
                     "id": "426c5c49-b6af-489d-8e9d-170c1dc676bd",
@@ -575,7 +554,6 @@
                     "value": "simple"
                 },
                 {
-                    "defaultValue": "5",
                     "description": "Estimated execution time",
                     "encoding": "pickle",
                     "id": "777e9f09-7c17-4969-922f-f67dc998f557",
@@ -590,7 +568,6 @@
                     "value": 5
                 },
                 {
-                    "defaultValue": "1",
                     "description": "Number of cores used",
                     "encoding": "pickle",
                     "id": "ab862ba7-3b47-4b0a-ab02-b09087cf4ba5",
@@ -605,7 +582,6 @@
                     "value": 1
                 },
                 {
-                    "defaultValue": "False",
                     "description": "Is this node the start of a group?",
                     "encoding": "pickle",
                     "id": "45e1fa61-1330-4c2b-bc52-b263f117de9d",
@@ -620,7 +596,6 @@
                     "value": false
                 },
                 {
-                    "defaultValue": "",
                     "description": "random array",
                     "encoding": "pickle",
                     "id": "25bf5b38-439c-49c9-b7cc-7905d34eed3a",
@@ -635,7 +610,6 @@
                     "value": ""
                 },
                 {
-                    "defaultValue": "def func_name(args): return args",
                     "description": "Python function code",
                     "encoding": "pickle",
                     "id": "5597ca69-cc61-4664-a1ff-015face1268e",
@@ -650,7 +624,6 @@
                     "value": ""
                 },
                 {
-                    "defaultValue": "func_name",
                     "description": "Python function name",
                     "encoding": "pickle",
                     "id": "e51b112a-5b05-4045-b490-69c323d758c9",
@@ -696,7 +669,6 @@
             "drawOrderHint": 0,
             "fields": [
                 {
-                    "defaultValue": "",
                     "description": "",
                     "encoding": "pickle",
                     "id": "935017d0-297b-4865-9e80-857c9abb160c",
@@ -711,7 +683,6 @@
                     "value": ""
                 },
                 {
-                    "defaultValue": "",
                     "description": "File path for this file. In many cases this does not need to be specified. If it has a \\/ at the end it will be treated as a directory name and the filename will be generated. If it does not have a \\/, the last part will be treated as a filename. If filepath does not start with \\/ (relative path) then the session directory will be prepended to make the path absolute.\"",
                     "encoding": "pickle",
                     "id": "a50129d4-c3c0-4fb0-b852-318804d612a4",
@@ -726,7 +697,6 @@
                     "value": ""
                 },
                 {
-                    "defaultValue": "False",
                     "description": "Perform a check to make sure the file path exists before proceeding with the application",
                     "encoding": "pickle",
                     "id": "847ed852-08f9-487a-b0a1-bf4ded4b007e",
@@ -741,7 +711,6 @@
                     "value": false
                 },
                 {
-                    "defaultValue": "dlg.data.drops.file.FileDROP",
                     "description": "Drop class",
                     "encoding": "pickle",
                     "id": "5c7836b9-615d-4699-95d3-32e0bb6001ef",
@@ -756,7 +725,6 @@
                     "value": "dlg.data.drops.file.FileDROP"
                 },
                 {
-                    "defaultValue": "file",
                     "description": "Base name of application class",
                     "encoding": "pickle",
                     "id": "35df7f9d-ae4f-4958-95b2-c0c7da26e1f7",
@@ -771,7 +739,6 @@
                     "value": "file"
                 },
                 {
-                    "defaultValue": "False",
                     "description": "Specifies whether this data component streams input and output data",
                     "encoding": "pickle",
                     "id": "5b2301af-3dab-4808-9390-b11c1fc24abd",
@@ -786,7 +753,6 @@
                     "value": false
                 },
                 {
-                    "defaultValue": "True",
                     "description": "Specifies whether this data component contains data that should not be deleted after execution",
                     "encoding": "pickle",
                     "id": "bd8f873e-c42c-429b-b271-9be0e7a3e937",
@@ -801,7 +767,6 @@
                     "value": true
                 },
                 {
-                    "defaultValue": "5",
                     "description": "Estimated size of the data contained in this node",
                     "encoding": "pickle",
                     "id": "aa3916b7-9655-47dd-9bb4-d19e735681a5",
@@ -816,7 +781,6 @@
                     "value": 5
                 },
                 {
-                    "defaultValue": "False",
                     "description": "Is this node the end of a group?",
                     "encoding": "pickle",
                     "id": "cafce87c-a4fc-4577-b3d9-12db2ecf94bc",
@@ -862,7 +826,6 @@
             "drawOrderHint": 0,
             "fields": [
                 {
-                    "defaultValue": "condition",
                     "description": "Python conditional function name. This can also be a valid import path to an importable function.",
                     "encoding": "pickle",
                     "id": "0cf1f143-b2ae-48e8-845c-c5710db34e83",
@@ -877,7 +840,6 @@
                     "value": "condition"
                 },
                 {
-                    "defaultValue": "condition(x): return (x > 0)",
                     "description": "Python function code for the branch condition. Modify as required. Note that func_name above needs to match the defined name here.",
                     "encoding": "pickle",
                     "id": "ebc131a6-c386-41e5-b415-1457cabfedf9",
@@ -892,7 +854,6 @@
                     "value": "def condition(x): return (x < 0.25)"
                 },
                 {
-                    "defaultValue": "",
                     "description": "Port carrying the input which is also used in the condition function. Note that the name of the parameter has to match the argument of the condition function.",
                     "encoding": "pickle",
                     "id": "84f8fa25-f087-491a-ab35-f47488fa423d",
@@ -907,7 +868,6 @@
                     "value": ""
                 },
                 {
-                    "defaultValue": "",
                     "description": "If condition is true the input will be copied to this port",
                     "encoding": "pickle",
                     "id": "8d74d420-7837-45c3-8b78-bb860cab8a5e",
@@ -922,7 +882,6 @@
                     "value": ""
                 },
                 {
-                    "defaultValue": "",
                     "description": "If condition is false the input will be copied to this port",
                     "encoding": "pickle",
                     "id": "6c139138-141c-4132-89b8-7879dda3c4ea",
@@ -937,7 +896,6 @@
                     "value": ""
                 },
                 {
-                    "defaultValue": "dlg.apps.simple.Branch",
                     "description": "Application class",
                     "encoding": "pickle",
                     "id": "c8ed89b2-41d1-4d79-be00-6fc5fac853eb",
@@ -952,7 +910,6 @@
                     "value": "dlg.apps.simple.Branch"
                 },
                 {
-                    "defaultValue": "simple",
                     "description": "Base name of application class",
                     "encoding": "pickle",
                     "id": "1d817943-bfd4-464e-a045-e5ea41faeb24",
@@ -967,7 +924,6 @@
                     "value": "simple"
                 },
                 {
-                    "defaultValue": "5",
                     "description": "Estimated execution time",
                     "encoding": "pickle",
                     "id": "548f1b6e-a83a-47c0-ba89-eda164b48ef3",
@@ -982,7 +938,6 @@
                     "value": 5
                 },
                 {
-                    "defaultValue": "1",
                     "description": "Number of cores used",
                     "encoding": "pickle",
                     "id": "05d74b2a-b5cf-4b74-8d9e-13a08e5cdfc8",
@@ -997,7 +952,6 @@
                     "value": 1
                 },
                 {
-                    "defaultValue": "False",
                     "description": "Is this node the start of a group?",
                     "encoding": "pickle",
                     "id": "5be2be09-576d-40b6-9cb4-79e14922b237",
@@ -1044,7 +998,6 @@
             "drawOrderHint": 0,
             "fields": [
                 {
-                    "defaultValue": "5",
                     "description": "The number of seconds to sleep",
                     "encoding": "pickle",
                     "id": "ca5dc087-30da-4ead-9350-672030fd2808",
@@ -1059,7 +1012,6 @@
                     "value": "5"
                 },
                 {
-                    "defaultValue": "",
                     "description": "",
                     "encoding": "pickle",
                     "id": "98a5f4a6-52cc-4720-bc79-ddab2c23594f",
@@ -1074,7 +1026,6 @@
                     "value": ""
                 },
                 {
-                    "defaultValue": "dlg.apps.simple.SleepAndCopyApp",
                     "description": "Application class",
                     "encoding": "pickle",
                     "id": "7394b3af-561f-4de8-af04-d83f6ae761ba",
@@ -1089,7 +1040,6 @@
                     "value": "dlg.apps.simple.SleepApp"
                 },
                 {
-                    "defaultValue": "simple",
                     "description": "Base name of application class",
                     "encoding": "pickle",
                     "id": "077459a2-b2dd-45ae-a01e-ed6eb0890188",
@@ -1104,7 +1054,6 @@
                     "value": "simple"
                 },
                 {
-                    "defaultValue": "5",
                     "description": "Estimated execution time",
                     "encoding": "pickle",
                     "id": "367ff7db-528d-41d6-928c-cd41be49403a",
@@ -1119,7 +1068,6 @@
                     "value": 5
                 },
                 {
-                    "defaultValue": "1",
                     "description": "Number of cores used",
                     "encoding": "pickle",
                     "id": "e5e4f74b-3416-44e4-9edc-5278598563e1",
@@ -1134,7 +1082,6 @@
                     "value": 1
                 },
                 {
-                    "defaultValue": "False",
                     "description": "Is this node the start of a group?",
                     "encoding": "pickle",
                     "id": "5ec6ffed-a310-4022-bdf7-981dbf5078f0",
@@ -1149,7 +1096,6 @@
                     "value": false
                 },
                 {
-                    "defaultValue": "def func_name(args): return args",
                     "description": "Python function code",
                     "encoding": "pickle",
                     "id": "ca272a37-ec63-418f-8cda-b33f8a03033c",
@@ -1164,7 +1110,6 @@
                     "value": ""
                 },
                 {
-                    "defaultValue": "func_name",
                     "description": "Python function name",
                     "encoding": "pickle",
                     "id": "a277e839-13f1-47ea-8c99-ea790c58d738",
@@ -1211,7 +1156,6 @@
             "drawOrderHint": 0,
             "fields": [
                 {
-                    "defaultValue": "",
                     "description": "",
                     "encoding": "pickle",
                     "id": "62927f63-3d46-41ff-8c3f-b2442c358d9d",
@@ -1226,7 +1170,6 @@
                     "value": ""
                 },
                 {
-                    "defaultValue": "None",
                     "description": "Data to be loaded into memory",
                     "encoding": "pickle",
                     "id": "9872088f-8c8a-4b61-b94e-c6c0de49fd95",
@@ -1241,7 +1184,6 @@
                     "value": "None"
                 },
                 {
-                    "defaultValue": "False",
                     "description": "Specifies whether this data component contains data that should not be deleted after execution",
                     "encoding": "pickle",
                     "id": "b21b9172-ee1e-42df-8c2a-9734cfcd8edc",
@@ -1256,7 +1198,6 @@
                     "value": false
                 },
                 {
-                    "defaultValue": "5",
                     "description": "Estimated size of the data contained in this node",
                     "encoding": "pickle",
                     "id": "e9ddc3e4-9b8a-4d2c-87c8-4c6e473cfe91",
@@ -1271,7 +1212,6 @@
                     "value": 5
                 },
                 {
-                    "defaultValue": "False",
                     "description": "Is this node the end of a group?",
                     "encoding": "pickle",
                     "id": "20b68fd0-18b5-4f4c-941e-8fede73e94a1",
@@ -1286,7 +1226,6 @@
                     "value": false
                 },
                 {
-                    "defaultValue": "False",
                     "description": "Specifies whether this data component streams input and output data",
                     "encoding": "pickle",
                     "id": "9a301468-9ceb-489f-b8ff-d148c30ffe0e",
@@ -1301,7 +1240,6 @@
                     "value": false
                 },
                 {
-                    "defaultValue": "dlg.data.drops.memory.InMemoryDROP",
                     "description": "Drop class",
                     "encoding": "pickle",
                     "id": "8fdbe6b0-225b-412a-a26b-626d3ea0bfc6",
@@ -1316,7 +1254,6 @@
                     "value": "dlg.data.drops.memory.InMemoryDROP"
                 },
                 {
-                    "defaultValue": "memory",
                     "description": "Base name of application class",
                     "encoding": "pickle",
                     "id": "f185eb01-fe2c-4438-8012-f2d16d4f2bc3",
@@ -1363,7 +1300,6 @@
             "drawOrderHint": 0,
             "fields": [
                 {
-                    "defaultValue": "None",
                     "description": "Data to be loaded into memory",
                     "encoding": "pickle",
                     "id": "314bc1a0-1efe-4e5f-895c-2870e6f1077f",
@@ -1378,7 +1314,6 @@
                     "value": "None"
                 },
                 {
-                    "defaultValue": "",
                     "description": "Dummy port",
                     "encoding": "pickle",
                     "id": "3eba1903-0a29-4d04-be3f-ce626cb098b8",
@@ -1393,7 +1328,6 @@
                     "value": ""
                 },
                 {
-                    "defaultValue": "False",
                     "description": "Specifies whether this data component contains data that should not be deleted after execution",
                     "encoding": "pickle",
                     "id": "82c40573-986f-4664-a409-facd4c1e0a89",
@@ -1408,7 +1342,6 @@
                     "value": false
                 },
                 {
-                    "defaultValue": "5",
                     "description": "Estimated size of the data contained in this node",
                     "encoding": "pickle",
                     "id": "fb87ae43-c385-4325-ae49-d0b8ee9a145f",
@@ -1423,7 +1356,6 @@
                     "value": 5
                 },
                 {
-                    "defaultValue": "False",
                     "description": "Is this node the end of a group?",
                     "encoding": "pickle",
                     "id": "b44b1d5a-89c5-4472-bc5f-69fd33e44b44",
@@ -1438,7 +1370,6 @@
                     "value": false
                 },
                 {
-                    "defaultValue": "False",
                     "description": "Specifies whether this data component streams input and output data",
                     "encoding": "pickle",
                     "id": "e6107615-09e4-4e1f-be0e-18c85a304431",
@@ -1453,7 +1384,6 @@
                     "value": false
                 },
                 {
-                    "defaultValue": "dlg.data.drops.memory.InMemoryDROP",
                     "description": "Drop class",
                     "encoding": "pickle",
                     "id": "06864a55-6e7e-4223-9a03-4f52d24fc3f8",
@@ -1468,7 +1398,6 @@
                     "value": "dlg.data.drops.memory.InMemoryDROP"
                 },
                 {
-                    "defaultValue": "memory",
                     "description": "Base name of application class",
                     "encoding": "pickle",
                     "id": "790aac93-9fb1-4884-894c-6e8d23f60537",
@@ -1515,7 +1444,6 @@
             "drawOrderHint": 0,
             "fields": [
                 {
-                    "defaultValue": "None",
                     "description": "Data to be loaded into memory",
                     "encoding": "pickle",
                     "id": "10da6df8-2d0b-4c59-95ed-885915d938e7",
@@ -1530,7 +1458,6 @@
                     "value": "None"
                 },
                 {
-                    "defaultValue": "",
                     "description": "Dummy port",
                     "encoding": "pickle",
                     "id": "0f87c684-95b4-4819-927a-9f04af8e86f8",
@@ -1545,7 +1472,6 @@
                     "value": ""
                 },
                 {
-                    "defaultValue": "False",
                     "description": "Specifies whether this data component contains data that should not be deleted after execution",
                     "encoding": "pickle",
                     "id": "c1742c4e-a078-45cb-8a72-ce9ec146f374",
@@ -1560,7 +1486,6 @@
                     "value": false
                 },
                 {
-                    "defaultValue": "5",
                     "description": "Estimated size of the data contained in this node",
                     "encoding": "pickle",
                     "id": "eb14b48c-5868-4e1f-8e6e-62cef2d80bd4",
@@ -1575,7 +1500,6 @@
                     "value": 5
                 },
                 {
-                    "defaultValue": "False",
                     "description": "Is this node the end of a group?",
                     "encoding": "pickle",
                     "id": "be3607c5-795d-4cbc-9d30-fa18f5a0013b",
@@ -1590,7 +1514,6 @@
                     "value": false
                 },
                 {
-                    "defaultValue": "False",
                     "description": "Specifies whether this data component streams input and output data",
                     "encoding": "pickle",
                     "id": "0ac29b09-6664-431f-8348-2888d6614d14",
@@ -1605,7 +1528,6 @@
                     "value": false
                 },
                 {
-                    "defaultValue": "dlg.data.drops.memory.InMemoryDROP",
                     "description": "Drop class",
                     "encoding": "pickle",
                     "id": "e642a41d-1a73-4a95-9016-b96db50423fd",
@@ -1620,7 +1542,6 @@
                     "value": "dlg.data.drops.memory.InMemoryDROP"
                 },
                 {
-                    "defaultValue": "memory",
                     "description": "Base name of application class",
                     "encoding": "pickle",
                     "id": "5c23495e-b8b5-4ea1-8a0b-58f04d4f71a1",
@@ -1667,7 +1588,6 @@
             "drawOrderHint": 0,
             "fields": [
                 {
-                    "defaultValue": "false",
                     "description": "Specifies whether this data component contains data that should not be deleted after execution",
                     "encoding": "pickle",
                     "id": "64a71ddc-680f-405b-a7d8-38ebf70cce57",
@@ -1682,7 +1602,6 @@
                     "value": false
                 },
                 {
-                    "defaultValue": "false",
                     "description": "Specifies whether this data component streams input and output data",
                     "encoding": "pickle",
                     "id": "f3a68c4d-a95f-4fa8-b3f7-bc014d9ed8cd",
@@ -1697,7 +1616,6 @@
                     "value": false
                 },
                 {
-                    "defaultValue": "0",
                     "description": "Estimate of execution time (in seconds) for this application.",
                     "encoding": "pickle",
                     "id": "73b3f4a6-ca9c-4976-bb40-a42d4ceb5381",
@@ -1712,7 +1630,6 @@
                     "value": 5
                 },
                 {
-                    "defaultValue": "0",
                     "description": "Number of CPUs used for this application.",
                     "encoding": "pickle",
                     "id": "debb7f2a-cd5e-4457-818e-df6439409b09",
@@ -1727,7 +1644,6 @@
                     "value": 1
                 },
                 {
-                    "defaultValue": "false",
                     "description": "Is this node the start of a group?",
                     "encoding": "pickle",
                     "id": "0bdf3e66-7b88-42e2-86f8-53731acc9ddc",
@@ -1742,7 +1658,6 @@
                     "value": true
                 },
                 {
-                    "defaultValue": "",
                     "description": "The python class that implements this application",
                     "encoding": "pickle",
                     "id": "2badab56-c9b5-405d-87b1-5ca54239fca8",
@@ -1757,7 +1672,6 @@
                     "value": "dlg.apps.simple.PickOne"
                 },
                 {
-                    "defaultValue": "",
                     "description": " Port for the rest of the array",
                     "encoding": "pickle",
                     "id": "081da0e5-84ce-4177-94c8-f2c32882369a",
@@ -1772,7 +1686,6 @@
                     "value": ""
                 },
                 {
-                    "defaultValue": "",
                     "description": " Port for the rest of the array",
                     "encoding": "pickle",
                     "id": "491b1606-d7a0-4209-a06c-99a1ee208e2c",
@@ -1787,7 +1700,6 @@
                     "value": ""
                 },
                 {
-                    "defaultValue": "def func_name(args): return args",
                     "description": "Python function code",
                     "encoding": "pickle",
                     "id": "335ec082-937b-45c0-a189-bab92692a27b",
@@ -1802,7 +1714,6 @@
                     "value": ""
                 },
                 {
-                    "defaultValue": "func_name",
                     "description": "Python function name",
                     "encoding": "pickle",
                     "id": "9e267433-f046-45d8-94f6-99612a1acd56",
@@ -1849,7 +1760,6 @@
             "drawOrderHint": 0,
             "fields": [
                 {
-                    "defaultValue": "None",
                     "description": "Data to be loaded into memory",
                     "encoding": "pickle",
                     "id": "c7879ac6-bb24-4a43-b87c-703b20bb9cb0",
@@ -1864,7 +1774,6 @@
                     "value": "None"
                 },
                 {
-                    "defaultValue": "",
                     "description": "Dummy port",
                     "encoding": "pickle",
                     "id": "1278eace-cb28-4ba3-a445-e70899b6093f",
@@ -1879,7 +1788,6 @@
                     "value": ""
                 },
                 {
-                    "defaultValue": "False",
                     "description": "Specifies whether this data component contains data that should not be deleted after execution",
                     "encoding": "pickle",
                     "id": "10bf61df-8f5c-40e2-915c-72f828daa242",
@@ -1894,7 +1802,6 @@
                     "value": true
                 },
                 {
-                    "defaultValue": "5",
                     "description": "Estimated size of the data contained in this node",
                     "encoding": "pickle",
                     "id": "3d5647bc-bdb1-4aa3-b2db-7ab97c8c3803",
@@ -1909,7 +1816,6 @@
                     "value": 5
                 },
                 {
-                    "defaultValue": "False",
                     "description": "Is this node the end of a group?",
                     "encoding": "pickle",
                     "id": "57c0686c-ea6d-43d5-a295-6c526124a76f",
@@ -1924,7 +1830,6 @@
                     "value": true
                 },
                 {
-                    "defaultValue": "False",
                     "description": "Specifies whether this data component streams input and output data",
                     "encoding": "pickle",
                     "id": "52c6867b-c121-41f7-9e82-d6975b98020e",
@@ -1939,7 +1844,6 @@
                     "value": false
                 },
                 {
-                    "defaultValue": "dlg.data.drops.memory.InMemoryDROP",
                     "description": "Drop class",
                     "encoding": "pickle",
                     "id": "4639bc05-58b3-4e97-9af9-db903bd49145",
@@ -1954,7 +1858,6 @@
                     "value": "dlg.data.drops.memory.InMemoryDROP"
                 },
                 {
-                    "defaultValue": "memory",
                     "description": "Base name of application class",
                     "encoding": "pickle",
                     "id": "6787d5bd-fa47-48b1-8182-bd1c40194d70",
@@ -1969,7 +1872,6 @@
                     "value": "memory"
                 },
                 {
-                    "defaultValue": "",
                     "description": "",
                     "encoding": "pickle",
                     "id": "65a9447a-b45f-4706-a85e-9b1e411c75a6",
diff --git a/src/Daliuge.ts b/src/Daliuge.ts
index e259eda5..c33e286b 100644
--- a/src/Daliuge.ts
+++ b/src/Daliuge.ts
@@ -89,6 +89,9 @@ export namespace Daliuge {
 
         //bash
         COMMAND = "command",
+
+        // legacy
+        APP_CLASS = "appclass",
     }
 
     export enum DataType {
@@ -171,31 +174,31 @@ export namespace Daliuge {
     }
 
     // These are the canonical example definition of each field
-    export const groupStartField = new Field(null, FieldName.GROUP_START, "true", "true", "Is this node the start of a group?", false, DataType.Boolean, false, [], false, FieldType.Component, FieldUsage.NoPort);
-    export const groupEndField = new Field(null, FieldName.GROUP_END, "true", "true", "Is this node the end of a group?", false, DataType.Boolean, false, [], false, FieldType.Component, FieldUsage.NoPort);
+    export const groupStartField = new Field(null, FieldName.GROUP_START, "true", "Is this node the start of a group?", false, DataType.Boolean, false, [], false, FieldType.Component, FieldUsage.NoPort);
+    export const groupEndField = new Field(null, FieldName.GROUP_END, "true", "Is this node the end of a group?", false, DataType.Boolean, false, [], false, FieldType.Component, FieldUsage.NoPort);
 
-    export const branchYesField = new Field(null, FieldName.TRUE, "", "", "The affirmative output from a branch node", false, DataType.Object, false, [], false, FieldType.Component, FieldUsage.OutputPort);
-    export const branchNoField  = new Field(null, FieldName.FALSE,  "", "", "he negative output from a branch node", false, DataType.Object, false, [], false, FieldType.Component, FieldUsage.OutputPort);
+    export const branchYesField = new Field(null, FieldName.TRUE, "", "The affirmative output from a branch node", false, DataType.Object, false, [], false, FieldType.Component, FieldUsage.OutputPort);
+    export const branchNoField  = new Field(null, FieldName.FALSE,  "", "The negative output from a branch node", false, DataType.Object, false, [], false, FieldType.Component, FieldUsage.OutputPort);
 
-    export const dropClassField = new Field(null, FieldName.DROP_CLASS, "", "", "", false, DataType.String, false, [], false, FieldType.Component, FieldUsage.NoPort);
+    export const dropClassField = new Field(null, FieldName.DROP_CLASS, "", "", false, DataType.String, false, [], false, FieldType.Component, FieldUsage.NoPort);
 
-    export const executionTimeField = new Field(null, FieldName.EXECUTION_TIME, "5", "5", "", false, DataType.Float, false, [], false, FieldType.Constraint, FieldUsage.NoPort);
-    export const numCpusField = new Field(null, FieldName.NUM_OF_CPUS, "1", "1", "", false, DataType.Integer, false, [], false, FieldType.Constraint, FieldUsage.NoPort);
-    export const dataVolumeField = new Field(null, FieldName.DATA_VOLUME, "5", "5", "", false, DataType.Float, false, [], false, FieldType.Constraint, FieldUsage.NoPort);
+    export const executionTimeField = new Field(null, FieldName.EXECUTION_TIME, "5", "", false, DataType.Float, false, [], false, FieldType.Constraint, FieldUsage.NoPort);
+    export const numCpusField = new Field(null, FieldName.NUM_OF_CPUS, "1", "", false, DataType.Integer, false, [], false, FieldType.Constraint, FieldUsage.NoPort);
+    export const dataVolumeField = new Field(null, FieldName.DATA_VOLUME, "5", "", false, DataType.Float, false, [], false, FieldType.Constraint, FieldUsage.NoPort);
 
-    export const kField = new Field(null, FieldName.K, "1", "1", "", false, DataType.Integer, false, [], false, FieldType.Construct, FieldUsage.NoPort);
-    export const numCopiesField = new Field(null, FieldName.NUM_OF_COPIES, "1", "1", "", false, DataType.Integer, false, [], false, FieldType.Construct, FieldUsage.NoPort);
-    export const numInputsField = new Field(null, FieldName.NUM_OF_INPUTS, "1", "1", "", false, DataType.Integer, false, [], false, FieldType.Construct, FieldUsage.NoPort);
-    export const numIterationsField = new Field(null, FieldName.NUM_OF_ITERATIONS, "1", "1", "", false, DataType.Integer, false, [], false, FieldType.Construct, FieldUsage.NoPort);
+    export const kField = new Field(null, FieldName.K, "1", "", false, DataType.Integer, false, [], false, FieldType.Construct, FieldUsage.NoPort);
+    export const numCopiesField = new Field(null, FieldName.NUM_OF_COPIES, "1", "", false, DataType.Integer, false, [], false, FieldType.Construct, FieldUsage.NoPort);
+    export const numInputsField = new Field(null, FieldName.NUM_OF_INPUTS, "1", "", false, DataType.Integer, false, [], false, FieldType.Construct, FieldUsage.NoPort);
+    export const numIterationsField = new Field(null, FieldName.NUM_OF_ITERATIONS, "1", "", false, DataType.Integer, false, [], false, FieldType.Construct, FieldUsage.NoPort);
 
-    export const baseNameField = new Field(null, FieldName.BASE_NAME, "", "", "The base name of the class of this Member function", false, DataType.String, false, [], false, FieldType.Component, FieldUsage.NoPort);
-    export const selfField = new Field(null, FieldName.SELF, "", "", "", false, DataType.Object, false, [], false, FieldType.Component, FieldUsage.InputOutput);
+    export const baseNameField = new Field(null, FieldName.BASE_NAME, "", "The base name of the class of this Member function", false, DataType.String, false, [], false, FieldType.Component, FieldUsage.NoPort);
+    export const selfField = new Field(null, FieldName.SELF, "", "", false, DataType.Object, false, [], false, FieldType.Component, FieldUsage.InputOutput);
 
-    export const funcCodeField = new Field(null, FieldName.FUNC_CODE, "", "def func_name(args): return args", "Python function code", false, Daliuge.DataType.Python, false, [], false, Daliuge.FieldType.Component, FieldUsage.NoPort);
-    export const funcNameField = new Field(null, FieldName.FUNC_NAME, "", "func_name", "Python function name", false, Daliuge.DataType.Python, false, [], false, Daliuge.FieldType.Component, FieldUsage.NoPort);
+    export const funcCodeField = new Field(null, FieldName.FUNC_CODE, "def func_name(args): return args", "Python function code", false, Daliuge.DataType.Python, false, [], false, Daliuge.FieldType.Component, FieldUsage.NoPort);
+    export const funcNameField = new Field(null, FieldName.FUNC_NAME, "func_name", "Python function name", false, Daliuge.DataType.Python, false, [], false, Daliuge.FieldType.Component, FieldUsage.NoPort);
 
-    export const persistField = new Field(null, FieldName.PERSIST, "false", "false", "Specifies whether this data component contains data that should not be deleted after execution", false, Daliuge.DataType.Boolean, false, [], false, Daliuge.FieldType.Component, Daliuge.FieldUsage.NoPort);
-    export const streamingField = new Field(null, FieldName.STREAMING, "false", "false", "Specifies whether this data component streams input and output data", false, Daliuge.DataType.Boolean, false, [], false, Daliuge.FieldType.Component, Daliuge.FieldUsage.NoPort);
+    export const persistField = new Field(null, FieldName.PERSIST, "false", "Specifies whether this data component contains data that should not be deleted after execution", false, Daliuge.DataType.Boolean, false, [], false, Daliuge.FieldType.Component, Daliuge.FieldUsage.NoPort);
+    export const streamingField = new Field(null, FieldName.STREAMING, "false", "Specifies whether this data component streams input and output data", false, Daliuge.DataType.Boolean, false, [], false, Daliuge.FieldType.Component, Daliuge.FieldUsage.NoPort);
 
     // This list defines the fields required for ALL nodes belonging to a given Category.Type
     export const categoryTypeFieldsRequired = [
diff --git a/src/Eagle.ts b/src/Eagle.ts
index b0946d41..ff0ea431 100644
--- a/src/Eagle.ts
+++ b/src/Eagle.ts
@@ -4153,7 +4153,6 @@ export class Eagle {
         if (newType === Daliuge.DataType.Select){
             if (field.getOptions().length === 0){
                 field.addOption(field.getValue());
-                field.addOption(field.getDefaultValue());
             }
         }
 
@@ -4616,7 +4615,7 @@ export class Eagle {
             newNode.removeAllOutputPorts();
 
             // add InputOutput port for dataType
-            const newInputOutputPort = new Field(Utils.generateFieldId(), srcPort.getDisplayText(), "", "", srcPort.getDescription(), false, srcPort.getType(), false, [], false, Daliuge.FieldType.Application, Daliuge.FieldUsage.InputOutput);
+            const newInputOutputPort = new Field(Utils.generateFieldId(), srcPort.getDisplayText(), "", srcPort.getDescription(), false, srcPort.getType(), false, [], false, Daliuge.FieldType.Application, Daliuge.FieldUsage.InputOutput);
             newNode.addField(newInputOutputPort);
 
             // set the parent of the new node
diff --git a/src/Field.ts b/src/Field.ts
index 892e7bbe..c1ba8e64 100644
--- a/src/Field.ts
+++ b/src/Field.ts
@@ -15,7 +15,6 @@ import { Utils } from './Utils';
 export class Field {
     private displayText : ko.Observable<string>; // user-facing name
     private value : ko.Observable<string>; // the current value
-    private defaultValue : ko.Observable<string>;  // default value
     private description : ko.Observable<string>;
     private readonly : ko.Observable<boolean>;
     private type : ko.Observable<Daliuge.DataType>; // NOTE: this is a little unusual (type can have more values than just the enum)
@@ -46,10 +45,9 @@ export class Field {
 
     private issues : ko.ObservableArray<{issue:Errors.Issue, validity:Errors.Validity}>//keeps track of issues on the field
 
-    constructor(id: FieldId, displayText: string, value: string, defaultValue: string, description: string, readonly: boolean, type: Daliuge.DataType, precious: boolean, options: string[], positional: boolean, parameterType: Daliuge.FieldType, usage: Daliuge.FieldUsage){
+    constructor(id: FieldId, displayText: string, value: string, description: string, readonly: boolean, type: Daliuge.DataType, precious: boolean, options: string[], positional: boolean, parameterType: Daliuge.FieldType, usage: Daliuge.FieldUsage){
         this.displayText = ko.observable(displayText);
         this.value = ko.observable(value);
-        this.defaultValue = ko.observable(defaultValue);
         this.description = ko.observable(description);
         this.readonly = ko.observable(readonly);
         this.type = ko.observable(type);
@@ -107,19 +105,6 @@ export class Field {
         return this;
     }
 
-    getDefaultValue = () : string => {
-        return this.defaultValue();
-    }
-
-    setDefaultValue = (value: string): Field => {
-        this.defaultValue(value);
-        return this;
-    }
-
-    hasDefaultValue = () : boolean => {
-        return this.value() === this.defaultValue();
-    }
-
     getDescription = () : string => {
         return this.description();
     }
@@ -130,7 +115,7 @@ export class Field {
     }
 
     getDescriptionText : ko.PureComputed<string> = ko.pureComputed(() => {
-        return this.description() == "" ? "No description available" + " (" + this.type() + ", default value:'" + this.defaultValue() + "')" : this.description() + " (" + this.type() + ", default value:'" + this.defaultValue() + "')";
+        return this.description() == "" ? "No description available" + " (" + this.type() + ")" : this.description();
     }, this);
 
     getInputPosition = () : {x:number, y:number} => {
@@ -216,11 +201,6 @@ export class Field {
         return this;
     }
 
-    toggleDefault = (): Field => {
-        this.defaultValue((!Utils.asBool(this.defaultValue())).toString());
-        return this;
-    }
-
     setType = (type: Daliuge.DataType) : Field => {
         this.type(type);
         return this;
@@ -245,13 +225,11 @@ export class Field {
     }
 
     editOption = (optionIndex: number, newVal: string) : Field => {
-        //if the option we are editing is selected well update the value or default value
+        // TODO: double check this, not sure I understand it fully
+        //if the option we are editing is selected well update the value
         if(this.options()[optionIndex] === this.value()){
             this.value(newVal)
         }
-        if(this.options()[optionIndex] === this.defaultValue()){
-            this.defaultValue(newVal)
-        }
 
         this.options()[optionIndex] = newVal
         this.options.valueHasMutated()
@@ -283,13 +261,9 @@ export class Field {
 
         //checking if a selected option is being deleted
         let valueDeleted = false
-        let defaultValueDeleted = false;
         if(this.options()[index] === this.value()){
             valueDeleted = true
         }
-        if(this.options()[index] === this.defaultValue()){
-            defaultValueDeleted = true
-        }
 
         //deleting the option
         this.options().splice(index,1)
@@ -298,9 +272,6 @@ export class Field {
         if(valueDeleted){
             this.value(this.options()[0])
         }
-        if(defaultValueDeleted){
-            this.defaultValue(this.options()[0])
-        }
         this.options.valueHasMutated()
         return this;
     }
@@ -437,7 +408,6 @@ export class Field {
     clear = () : Field => {
         this.displayText("");
         this.value("");
-        this.defaultValue("");
         this.description("");
         this.readonly(false);
         this.type(Daliuge.DataType.Unknown);
@@ -462,7 +432,7 @@ export class Field {
             options.push(option);
         }
 
-        const f = new Field(this.id(), this.displayText(), this.value(), this.defaultValue(), this.description(), this.readonly(), this.type(), this.precious(), options, this.positional(), this.parameterType(), this.usage());
+        const f = new Field(this.id(), this.displayText(), this.value(), this.description(), this.readonly(), this.type(), this.precious(), options, this.positional(), this.parameterType(), this.usage());
         f.encoding(this.encoding());
         f.isEvent(this.isEvent());
         f.node(this.node());
@@ -474,12 +444,11 @@ export class Field {
     }
 
     shallowCopy = () : Field => {
-        const f = new Field(this.id(), this.displayText(), this.value(), this.defaultValue(), this.description(), this.readonly(), this.type(), this.precious(), this.options(), this.positional(), this.parameterType(), this.usage());
+        const f = new Field(this.id(), this.displayText(), this.value(), this.description(), this.readonly(), this.type(), this.precious(), this.options(), this.positional(), this.parameterType(), this.usage());
 
         f.id = this.id;
         f.displayText = this.displayText;
         f.value = this.value;
-        f.defaultValue = this.defaultValue;
         f.description = this.description;
         f.readonly = this.readonly;
         f.type = this.type;
@@ -497,11 +466,6 @@ export class Field {
         return f;
     }
 
-    resetToDefault = () : Field => {
-        this.value(this.defaultValue());
-        return this;
-    }
-
     // TODO: rename this slightly so that it is more obvious that it is a user-facing version of the value
     //       as it is I get confused between this and getValue() when auto-completing
     getFieldValue = () : string => {
@@ -515,7 +479,6 @@ export class Field {
     copyWithIds = (src: Field, node: Node, id: FieldId) : Field => {
         this.displayText(src.displayText());
         this.value(src.value());
-        this.defaultValue(src.defaultValue());
         this.description(src.description());
         this.readonly(src.readonly());
         this.type(src.type());
@@ -740,7 +703,6 @@ export class Field {
         return {
             name:field.displayText(),
             value:Field.stringAsType(field.value(), field.type()),
-            defaultValue:field.defaultValue(),
             description:field.description(),
             readonly:field.readonly(),
             type:field.isEvent() ? "Event" : field.type(),
@@ -758,7 +720,6 @@ export class Field {
         return {
             name:field.displayText(),
             value:Field.stringAsType(field.value(), field.type()),
-            defaultValue:field.defaultValue(),
             description:field.description(),
             readonly:field.readonly(),
             type:field.isEvent() ? "Event" : field.type(),
@@ -780,7 +741,6 @@ export class Field {
         let readonly: boolean = false;
         let type: Daliuge.DataType = Daliuge.DataType.Unknown;
         let value: string = "";
-        let defaultValue: string = "";
         let precious: boolean = false;
         let options: string[] = [];
         let positional: boolean = false;
@@ -809,8 +769,6 @@ export class Field {
         }
         if (typeof data.value !== 'undefined' && data.value !== null)
             value = data.value.toString();
-        if (typeof data.defaultValue !== 'undefined' && data.defaultValue !== null)
-            defaultValue = data.defaultValue.toString();
         if (typeof data.precious !== 'undefined')
             precious = data.precious;
         if (typeof data.options !== 'undefined')
@@ -858,7 +816,7 @@ export class Field {
             isEvent = data.event;
         if (typeof data.encoding !== 'undefined')
             encoding = data.encoding;
-        const result = new Field(id, name, value, defaultValue, description, readonly, type, precious, options, positional, parameterType, usage);
+        const result = new Field(id, name, value, description, readonly, type, precious, options, positional, parameterType, usage);
         result.isEvent(isEvent);
         result.encoding(encoding);
         return result;
@@ -887,7 +845,7 @@ export class Field {
             name = data.IdText;
         }
      
-        const f = new Field(data.Id, name, "", "", description, false, type, false, [], false, Daliuge.FieldType.Unknown, Daliuge.FieldUsage.NoPort);
+        const f = new Field(data.Id, name, "", description, false, type, false, [], false, Daliuge.FieldType.Unknown, Daliuge.FieldUsage.NoPort);
         f.isEvent(event);
         f.encoding(encoding);
         return f;
@@ -897,7 +855,6 @@ export class Field {
         let id: FieldId;
         let name: string;
         let value: string;
-        let defaultValue: string;
         let description: string;
         let readonly: boolean;
         let type: Daliuge.DataType;
@@ -916,8 +873,6 @@ export class Field {
             name = data.name;
         if (typeof data.value !== 'undefined')
             value = data.value.toString();
-        if (typeof data.defaultValue !== 'undefined')
-            defaultValue = data.defaultValue.toString();
         if (typeof data.description !== 'undefined')
             description = data.description;
         if (typeof data.readonly !== 'undefined')
@@ -940,7 +895,7 @@ export class Field {
         if (typeof data.encoding !== 'undefined')
             encoding = data.encoding;
 
-        const f = new Field(id, name, value, defaultValue, description, readonly, type, precious, options, positional, parameterType, usage);
+        const f = new Field(id, name, value, description, readonly, type, precious, options, positional, parameterType, usage);
         f.isEvent(event);
         f.encoding(encoding);
         return f;
diff --git a/src/Modals.ts b/src/Modals.ts
index 84548a01..ffde6bd3 100644
--- a/src/Modals.ts
+++ b/src/Modals.ts
@@ -579,10 +579,7 @@ export class Modals {
 
         //reset value fields dataType specific attributes
         $('#editFieldModalValueInputNumber').removeClass('inputNoArrows')
-        $('#editFieldModalDefaultValueInputNumber').removeClass('inputNoArrows')
         $('#editFieldModalValueInputNumber').removeAttr('min').removeAttr('step').removeAttr('onfocus').removeAttr( 'onkeydown').removeAttr( 'oninput')
-        $('#editFieldModalDefaultValueInputNumber').removeAttr('min').removeAttr('step').removeAttr('onfocus').removeAttr( 'onkeydown').removeAttr( 'oninput')
-        
 
         //toggle on the correct value input fields depending on type
         $('#editFieldModalValueInputText').toggle(dataType !== Daliuge.DataType.Boolean && dataType !== Daliuge.DataType.Select && dataType !== Daliuge.DataType.Float && dataType !== Daliuge.DataType.Integer);
@@ -590,19 +587,11 @@ export class Modals {
         $('#editFieldModalValueInputCheckbox').parent().toggle(dataType === Daliuge.DataType.Boolean);
         $('#editFieldModalValueInputSelect').toggle(dataType === Daliuge.DataType.Select);
 
-        $('#editFieldModalDefaultValueInputText').toggle(dataType !== Daliuge.DataType.Boolean && dataType !== Daliuge.DataType.Select && dataType !== Daliuge.DataType.Float && dataType !== Daliuge.DataType.Integer);
-        $('#editFieldModalDefaultValueInputNumber').toggle(dataType === Daliuge.DataType.Float || dataType === Daliuge.DataType.Integer);
-        $('#editFieldModalDefaultValueInputCheckbox').parent().toggle(dataType === Daliuge.DataType.Boolean);
-        $('#editFieldModalDefaultValueInputSelect').toggle(dataType === Daliuge.DataType.Select);
-
         //setting up number value input specific things that are different for integers of floats 
         if(dataType === Daliuge.DataType.Integer){
             $('#editFieldModalValueInputNumber').attr('min',"0").attr('step',"1").attr('onfocus',"this.previousValue = this.value").attr( 'onkeydown', "this.previousValue = this.value").attr( 'oninput',"validity.valid || (value = this.previousValue)")
-            $('#editFieldModalDefaultValueInputNumber').attr('min',"0").attr('step',"1").attr('onfocus',"this.previousValue = this.value").attr( 'onkeydown', "this.previousValue = this.value").attr( 'oninput',"validity.valid || (value = this.previousValue)")
-
         }else if (dataType === Daliuge.DataType.Float){
             $('#editFieldModalValueInputNumber').addClass('inputNoArrows')
-            $('#editFieldModalDefaultValueInputNumber').addClass('inputNoArrows')
         }
     }
 
diff --git a/src/Node.ts b/src/Node.ts
index 0a17cb53..c594cc06 100644
--- a/src/Node.ts
+++ b/src/Node.ts
@@ -1348,7 +1348,7 @@ export class Node {
     }
 
     addEmptyField = () : Node => {
-        const newField = new Field(Utils.generateFieldId(), "New Parameter", "", "", "", false, Daliuge.DataType.String, false, [], false, Daliuge.FieldType.Application, Daliuge.FieldUsage.NoPort);
+        const newField = new Field(Utils.generateFieldId(), "New Parameter", "", "", false, Daliuge.DataType.String, false, [], false, Daliuge.FieldType.Application, Daliuge.FieldUsage.NoPort);
         this.addField(newField);
         return this;
     }
diff --git a/src/ParameterTable.ts b/src/ParameterTable.ts
index fb26fd2e..d68b1c61 100644
--- a/src/ParameterTable.ts
+++ b/src/ParameterTable.ts
@@ -97,8 +97,6 @@ export class ParameterTable {
             selectedForm.setDisplayText(value)
         } else if(selected === 'value'){
             selectedForm.setValue(value)
-        } else if(selected === 'defaultValue'){
-            selectedForm.setDefaultValue(value)
         } else if(selected === 'description'){
             selectedForm.setDescription(value)
         }
@@ -144,7 +142,7 @@ export class ParameterTable {
                         const lgNode = lg.getNodeById(graphConfigNode.getNode().getId());
 
                         if (typeof lgNode === 'undefined'){
-                            const dummyField: Field = new Field(graphConfigField.getField().getId(), "<Missing Node:" + graphConfigNode.getNode().getId() +">", graphConfigField.getValue(), "?", graphConfigField.getComment(), true, Daliuge.DataType.Unknown, false, [], false, Daliuge.FieldType.Unknown, Daliuge.FieldUsage.NoPort);
+                            const dummyField: Field = new Field(graphConfigField.getField().getId(), "<Missing Node:" + graphConfigNode.getNode().getId() +">", graphConfigField.getValue(), graphConfigField.getComment(), true, Daliuge.DataType.Unknown, false, [], false, Daliuge.FieldType.Unknown, Daliuge.FieldUsage.NoPort);
                             dummyField.setNode(lgNode);
                             displayedFields.push(dummyField);
                             continue;
@@ -153,7 +151,7 @@ export class ParameterTable {
                         const lgField = lgNode.getFieldById(graphConfigField.getField().getId());
         
                         if (typeof lgField === 'undefined'){
-                            const dummyField: Field = new Field(graphConfigField.getField().getId(), "<Missing Field: " + graphConfigField.getField().getId() + ">", graphConfigField.getValue(), "?", graphConfigField.getComment(), true, Daliuge.DataType.Unknown, false, [], false, Daliuge.FieldType.Unknown, Daliuge.FieldUsage.NoPort);
+                            const dummyField: Field = new Field(graphConfigField.getField().getId(), "<Missing Field: " + graphConfigField.getField().getId() + ">", graphConfigField.getValue(), graphConfigField.getComment(), true, Daliuge.DataType.Unknown, false, [], false, Daliuge.FieldType.Unknown, Daliuge.FieldUsage.NoPort);
                             dummyField.setNode(lgNode);
                             displayedFields.push(dummyField);
                             continue;
@@ -201,9 +199,6 @@ export class ParameterTable {
         }else if(ParameterTable.sortingColumn === 'value'){
             valA = a.getValue()
             valB = b.getValue()
-        }else if(ParameterTable.sortingColumn === 'defaultValue'){
-            valA = a.getDefaultValue()
-            valB = b.getDefaultValue()
         }else if(ParameterTable.sortingColumn === 'description'){
             valA = a.getDescription()
             valB = b.getDescription()
@@ -489,32 +484,28 @@ export class ParameterTable {
         field.setDescription(fieldDescription);
     }
 
-    static async requestEditValueField(field:Field, defaultValue: boolean) : Promise<void> {
+    static async requestEditValueField(field:Field) : Promise<void> {
         const eagle: Eagle = Eagle.getInstance();
         const node: Node = eagle.selectedNode();
 
         let editingField: Field | GraphConfigField // this will either be the normal field or the configured field if applicable
-        let editingValue: string // this will either be the value or default value or configured value
 
-        //checking if the field is a configured field
-        if(!defaultValue && field.getGraphConfigField()){
-            editingField = field.getGraphConfigField()
-            editingValue = editingField.getValue()
+        // look for a field in the GraphConfig matching this field
+        const graphConfigField: GraphConfigField = field.getGraphConfigField();
+
+        // checking if the field is a configured field
+        if(graphConfigField){
+            editingField = graphConfigField
         }else{
             editingField = field
-            if(defaultValue){
-                editingValue = editingField.getDefaultValue()
-            }else{
-                editingValue = editingField.getValue()
-            }
         }
 
         let fieldValue: string;
         try {
             if (this.isCodeField(field.getDisplayText())){ 
-                fieldValue = await Utils.requestUserCode("python", "Edit Value  |  Node: " + node.getName() + " - Field: " + field.getDisplayText(), editingValue, false);
+                fieldValue = await Utils.requestUserCode("python", "Edit Value  |  Node: " + node.getName() + " - Field: " + field.getDisplayText(), editingField.getValue(), false);
             }else {
-                fieldValue = await Utils.requestUserText("Edit Value  |  Node: " + node.getName() + " - Field: " + field.getDisplayText(), "Please edit the value for: " + node.getName() + ' - ' + field.getDisplayText(), editingValue, false);
+                fieldValue = await Utils.requestUserText("Edit Value  |  Node: " + node.getName() + " - Field: " + field.getDisplayText(), "Please edit the value for: " + node.getName() + ' - ' + field.getDisplayText(), editingField.getValue(), false);
             }
         } catch (error) {
             console.error(error);
@@ -522,11 +513,7 @@ export class ParameterTable {
         }
 
         // set the Value on the field
-        if(defaultValue && editingField instanceof Field){
-            editingField.setDefaultValue(fieldValue);
-        }else{
-            editingField.setValue(fieldValue);
-        }
+        editingField.setValue(fieldValue);
     }
 
     static async requestEditCommentInModal(currentField:Field): Promise<void> {
@@ -861,7 +848,6 @@ export class ColumnVisibilities {
     private fieldId:ko.Observable<boolean>
     private value:ko.Observable<boolean>
     private readOnly:ko.Observable<boolean>
-    private defaultValue:ko.Observable<boolean>
     private description:ko.Observable<boolean>
     private type:ko.Observable<boolean>
     private parameterType:ko.Observable<boolean>
@@ -870,7 +856,7 @@ export class ColumnVisibilities {
     private flags:ko.Observable<boolean>
     private actions:ko.Observable<boolean>
 
-    constructor(uiModeName:string, keyAttribute:boolean, displayText:boolean,fieldId:boolean,value:boolean,readOnly:boolean,defaultValue:boolean,description:boolean,type:boolean,parameterType:boolean,usage:boolean,encoding:boolean,flags:boolean,actions:boolean){
+    constructor(uiModeName:string, keyAttribute:boolean, displayText:boolean,fieldId:boolean,value:boolean,readOnly:boolean,description:boolean,type:boolean,parameterType:boolean,usage:boolean,encoding:boolean,flags:boolean,actions:boolean){
 
         this.uiModeName = uiModeName;
         this.keyAttribute = ko.observable(keyAttribute);
@@ -878,7 +864,6 @@ export class ColumnVisibilities {
         this.fieldId = ko.observable(fieldId);
         this.value = ko.observable(value);
         this.readOnly = ko.observable(readOnly);
-        this.defaultValue = ko.observable(defaultValue);
         this.description = ko.observable(description);
         this.type = ko.observable(type);
         this.parameterType = ko.observable(parameterType);
@@ -935,10 +920,6 @@ export class ColumnVisibilities {
         this.readOnly(value);
     }
 
-    private setDefaultValue = (value:boolean) : void => {
-        this.defaultValue(value);
-    }
-
     private setDescription = (value:boolean) : void => {
         this.description(value);
     }
@@ -993,11 +974,6 @@ export class ColumnVisibilities {
         this.saveToLocalStorage()
     }
 
-    private toggleDefaultValue = () : void => {
-        this.defaultValue(!this.defaultValue());
-        this.saveToLocalStorage()
-    }
-
     private toggleDescription = () : void => {
         this.description(!this.description());
         this.saveToLocalStorage()
@@ -1043,7 +1019,6 @@ export class ColumnVisibilities {
                 fieldId : columnVis.fieldId(),
                 value : columnVis.value(),
                 readOnly : columnVis.readOnly(),
-                defaultValue : columnVis.defaultValue(),
                 description : columnVis.description(),
                 type : columnVis.type(),
                 parameterType : columnVis.parameterType(),
@@ -1082,9 +1057,6 @@ export class ColumnVisibilities {
                 if(columnVisibility.readOnly != null){
                     columnVisActual.setReadOnly(columnVisibility.readOnly)
                 }
-                if(columnVisibility.defaultValue != null){
-                    columnVisActual.setDefaultValue(columnVisibility.defaultValue)
-                }
                 if(columnVisibility.description != null){
                     columnVisActual.setDescription(columnVisibility.description)
                 }
@@ -1112,11 +1084,11 @@ export class ColumnVisibilities {
 }
 
 
-// name, keyAttribute,displayText,value,readOnly,defaultValue,description,type,parameterType,usage,flags,actions
+// name, keyAttribute,displayText,value,readOnly,description,type,parameterType,usage,flags,actions
 const columnVisibilities : ColumnVisibilities[] = [
-    new ColumnVisibilities("Student", false, true,false,true,true,false,false,false,false,false,false,false,false),
-    new ColumnVisibilities("Minimal", true, true,false,true,true,false,false,false,false,false,false,true,false),
-    new ColumnVisibilities("Graph", true, true,false,true,true,true,false,true,true,true,false,true,true),
-    new ColumnVisibilities("Component", true, true,false,true,true,true,true,true,true,true,false,true,true),
-    new ColumnVisibilities("Expert", true, true,false,true,true,true,true,true,true,true,true,true,true)
+    new ColumnVisibilities("Student", false, true,false,true,true,false,false,false,false,false,false,false),
+    new ColumnVisibilities("Minimal", true, true,false,true,true,false,false,false,false,false,true,false),
+    new ColumnVisibilities("Graph", true, true,false,true,true,false,true,true,true,false,true,true),
+    new ColumnVisibilities("Component", true, true,false,true,true,true,true,true,true,false,true,true),
+    new ColumnVisibilities("Expert", true, true,false,true,true,true,true,true,true,true,true,true)
 ]
\ No newline at end of file
diff --git a/src/RightClick.ts b/src/RightClick.ts
index de57f2ba..be31b3ae 100644
--- a/src/RightClick.ts
+++ b/src/RightClick.ts
@@ -456,7 +456,7 @@ export class RightClick {
         }
 
         const funcCodeField = rightClickObject.findFieldByDisplayText(Daliuge.FieldName.FUNC_CODE);
-        ParameterTable.requestEditValueField(funcCodeField, false)
+        ParameterTable.requestEditValueField(funcCodeField)
     }
 
     // TODO: event var used in function is the deprecated global, we should get access to the event via some other method
diff --git a/src/Utils.ts b/src/Utils.ts
index a754a43d..40a017cc 100644
--- a/src/Utils.ts
+++ b/src/Utils.ts
@@ -1918,26 +1918,6 @@ export class Utils {
         field.setValue(value);
     }
 
-    static fixFieldDefaultValue(eagle: Eagle, field: Field){
-        // depends on the type
-        switch(field.getType()){
-            case Daliuge.DataType.Boolean:
-            field.setDefaultValue("false");
-            break;
-            case Daliuge.DataType.Integer:
-            case Daliuge.DataType.Float:
-            field.setDefaultValue("0");
-            break;
-            case Daliuge.DataType.Json:
-            case Daliuge.DataType.Python:
-            field.setDefaultValue("{}");
-            break;
-            default:
-            field.setDefaultValue("");
-            break;
-        }
-    }
-
     static fixFieldType(eagle: Eagle, field: Field){
         // fix for undefined value
         if (field.getType() === undefined){
@@ -1999,7 +1979,7 @@ export class Utils {
         const srcPortType = destPort.getType() === undefined ? Daliuge.DataType.Object : destPort.getType();
 
         // create new source port
-        const srcPort = new Field(edge.getSrcPort().getId(), destPort.getDisplayText(), "", "", "", false, srcPortType, false, [], false, Daliuge.FieldType.Application, Daliuge.FieldUsage.OutputPort);
+        const srcPort = new Field(edge.getSrcPort().getId(), destPort.getDisplayText(), "", "", false, srcPortType, false, [], false, Daliuge.FieldType.Application, Daliuge.FieldUsage.OutputPort);
 
         // add port to source node
         srcNode.addField(srcPort);
@@ -2018,7 +1998,7 @@ export class Utils {
         const destPortType = srcPort.getType() === undefined ? Daliuge.DataType.Object : srcPort.getType();
 
         // create new destination port
-        const destPort = new Field(edge.getDestPort().getId(), srcPort.getDisplayText(), "", "", "", false, destPortType, false, [], false, Daliuge.FieldType.Application, Daliuge.FieldUsage.OutputPort);
+        const destPort = new Field(edge.getDestPort().getId(), srcPort.getDisplayText(), "", "", false, destPortType, false, [], false, Daliuge.FieldType.Application, Daliuge.FieldUsage.OutputPort);
 
         // add port to destination node
         destNode.addField(destPort);
@@ -2069,7 +2049,7 @@ export class Utils {
     static addMissingRequiredField(eagle: Eagle, node: Node, requiredField: Field){
         // if requiredField is "dropclass", and node already contains an "appclass" field, then just rename it
         if (requiredField.getDisplayText() === Daliuge.FieldName.DROP_CLASS){
-            const appClassField = node.getFieldByDisplayText("appclass");
+            const appClassField = node.getFieldByDisplayText(Daliuge.FieldName.APP_CLASS);
 
             if (appClassField !== null){
                 appClassField.setDisplayText(Daliuge.FieldName.DROP_CLASS);
@@ -2113,8 +2093,7 @@ export class Utils {
                 if (paletteComponent !== null){
                     const dropClassField: Field = paletteComponent.findFieldByDisplayText(Daliuge.FieldName.DROP_CLASS);
 
-                    field.setValue(dropClassField.getDefaultValue());
-                    field.setDefaultValue(dropClassField.getDefaultValue());
+                    field.setValue(dropClassField.getValue());
                 }
 
                 break;
@@ -2375,7 +2354,6 @@ export class Utils {
                 "usage":field.getUsage(),
                 "isEvent":field.getIsEvent(),
                 "value":field.getValue(),
-                "defaultValue": field.getDefaultValue(),
                 "readonly":field.isReadonly()
             });
         }
diff --git a/src/main.ts b/src/main.ts
index ff3e1c54..5022d12a 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -201,14 +201,6 @@ $(function(){
         $(event.target).parent().find("span").text($(event.target).prop('checked'))
     })
 
-    $('#editFieldModalDefaultValueInputCheckbox').on("change",function(event: JQuery.TriggeredEvent){
-        $(event.target).parent().find("span").text($(event.target).prop('checked'))
-    })
-
-    $('#componentDefaultValueCheckbox').on('click',function(event: JQuery.TriggeredEvent){
-        $((event.target)).find('input').trigger("click")
-    })
-
     $('#componentValueCheckbox').on('click',function(event: JQuery.TriggeredEvent){
         $((event.target)).find('input').trigger("click")
     })
diff --git a/static/lg.graph.v4.schema b/static/lg.graph.v4.schema
index e9472c0c..37ad3080 100644
--- a/static/lg.graph.v4.schema
+++ b/static/lg.graph.v4.schema
@@ -174,9 +174,6 @@
                                         "value": {
                                             "type": ["string", "boolean", "number", "null"]
                                         },
-                                        "defaultValue": {
-                                            "type": ["string", "boolean", "number", "null"]
-                                        },
                                         "description": {
                                             "type": "string"
                                         },
@@ -225,7 +222,6 @@
                                         "description",
                                         "name",
                                         "value",
-                                        "defaultValue",
                                         "readonly",
                                         "type",
                                         "precious",
diff --git a/templates/modals/edit_field.html b/templates/modals/edit_field.html
index 9c6ff85c..d4368bde 100644
--- a/templates/modals/edit_field.html
+++ b/templates/modals/edit_field.html
@@ -66,65 +66,6 @@ <h5 class="modal-title" id="editFieldModalTitle">Edit Parameter</h5>
                                 </div>
                             </div>
 
-<!-- default value -->
-                            <div class="row" id="editFieldModalDefaultValue">
-                                <div class="col-3">
-                                    <p>Default Value:</p>
-                                </div>
-                                <div class="col">
-                                    <div class="input-group mb-3">
-
-                                        <!-- string -->
-                                        <!-- ko if: $data.isStringValueType() --> 
-                                            <textarea type="text" class="form-control" id="editFieldModalDefaultValueInputText" data-bind="checked: valIsTrue($data.defaultValue()), valueUpdate: ['afterkeydown', 'input'], value: defaultValue, event: {change: function(){$root.selectedObjects.valueHasMutated()},keyup:function(data,event){Modals.validateFieldModalValueInputText(data,event)}}"></textarea>
-                                        <!-- /ko -->
-
-                                        <!-- float -->
-                                        <!-- ko if: $data.isFloatValueType() -->
-                                            <input type="number" id="editFieldModalDefaultValueInputNumber" class="form-control" data-bind="checked: valIsTrue($data.defaultValue()), valueUpdate: ['afterkeydown', 'input'], value: defaultValue, event: {change: function(){$root.selectedObjects.valueHasMutated()}}">
-                                        <!-- /ko -->
-
-                                        <!-- integer -->
-                                        <!-- ko if: $data.isIntegerValueType() -->
-                                            <input type="number" id="editFieldModalDefaultValueInputNumber" class="form-control" step="1" onfocus="this.previousValue = this.value" onkeydown="this.previousValue = this.value" oninput="validity.valid || (value = this.previousValue)" data-bind="checked: valIsTrue($data.defaultValue()), valueUpdate: ['afterkeydown', 'input'], value: defaultValue, event: {change: function(){$root.selectedObjects.valueHasMutated()}}">
-                                        <!-- /ko -->
-
-                                        <!-- boolean -->
-                                        <!-- ko if: $data.isBooleanValueType() -->
-                                            <div class="input-group componentCheckbox" id="componentDefaultValueCheckbox" data-bind="click:$data.toggleDefault">
-                                                <span class="noselect" data-bind="text:defaultValue"></span>
-                                                <input type="checkbox" tabindex='-1' class="form-control form-check-input" id="editFieldModalDefaultValueInputCheckbox" data-bind="checked: valIsTrue($data.defaultValue()), valueUpdate: ['afterkeydown', 'input'], value: defaultValue, event: {change: function(){$data.toggleDefault(); $root.selectedObjects.valueHasMutated();}}">
-                                            </div>
-                                        <!-- /ko -->
-
-                                        <!-- select -->
-                                        <!-- ko if: $data.isSelectValueType() -->
-                                            <!-- ko ifnot: Setting.findValue(Setting.ALLOW_COMPONENT_EDITING) -->
-                                                <select class="form-control" id="editFieldModalDefaultValueInputSelect" aria-label="Label" aria-describedby="group-addon" data-bs-placement="bottom" data-bind="event: {change: function(){$root.selectedObjects.valueHasMutated();}}, options: $data.options, value: $data.defaultValue">
-                                                    <!-- options are added dynamically -->
-                                                </select>
-                                            <!-- /ko --> 
-                                            <!-- ko if: Setting.findValue(Setting.ALLOW_COMPONENT_EDITING) -->
-                                                <div class="dropdown parameterTableTypeCustomSelect">
-                                                    <a class="dropdown-toggle dropdown-control" data-bind="text:$data.defaultValue" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></a>
-                                                    <div class="dropdown-menu dropdown-menu-right dropdown-area" aria-labelledby="parameterTableTpeCustomSelect">
-                                                        <!-- ko foreach:$data.options()-->
-                                                            <div class="dropdown-item" data-bind="click:function(data, event){$parent.setDefaultValue($data);}">
-                                                                <input class="defaultSelectCustom" data-bind="value:$data, event: {change:function(data,event){$parent.editOption($index(),$(event.target).val())}}" type="text">
-                                                                <button class="typeSelectDelete" data-bind="clickBubble:false, click: function(){$parent.removeOption($index())}"><i class="material-symbols-outlined md-24">delete</i></button>
-                                                            </div>
-                                                        <!-- /ko --> 
-                                                        <div class="dropdown-item add" data-bind="click:function(data,event){event.stopPropagation();addOption('')}">
-                                                            <i class="material-symbols-outlined">add</i>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            <!-- /ko --> 
-                                        <!-- /ko --> 
-                                    </div>
-                                </div>
-                            </div>
-
 <!-- description -->
                             <div class="row">
                                 <div class="col-3">
@@ -214,7 +155,6 @@ <h5 class="modal-title" id="editFieldModalTitle">Edit Parameter</h5>
                         </div>
                     </div>
                     <div class="modal-footer" style="justify-content:space-between;">
-                        <button type="button" class="btn btn-secondary" id="editFieldModalResetToDefaultButton" data-bind="click:function(){$data.resetToDefault()}"><span>Reset to Default</span></button>
                         <button type="button" class="btn btn-primary" id="editFieldModalAffirmativeButton" data-bs-dismiss="modal" data-bind="click:function(){$('#editFieldModal').data('completed', true);}"><span id="editFieldModalAffirmativeAnswer">OK</span></button>
                     </div>
                 <!-- /ko -->
diff --git a/templates/node_parameter_table.html b/templates/node_parameter_table.html
index 933a5c00..a5299cdc 100644
--- a/templates/node_parameter_table.html
+++ b/templates/node_parameter_table.html
@@ -38,7 +38,6 @@ <h5 class="bottomWindowHeader">Node Fields Table: <span>(No selection)</span></h
             <div class="dropdown-menu dropdown-menu-right dropdown-area">
                 <div class="dropdown-item" data-bind="click:function(){ParameterTable.getActiveColumnVisibility().toggleKeyAttribute()}"><span>Key Parameter</span><input type="checkbox" data-bind="checked:ParameterTable.getActiveColumnVisibility().keyAttribute()"></div>
                 <div class="dropdown-item" data-bind="click:function(){ParameterTable.getActiveColumnVisibility().toggleFieldId()}"><span>Field ID</span><input type="checkbox" data-bind="checked:ParameterTable.getActiveColumnVisibility().fieldId()"></div>
-                <div class="dropdown-item" data-bind="click:function(){ParameterTable.getActiveColumnVisibility().toggleDefaultValue()}"><span>Default Value</span><input type="checkbox" data-bind="checked:ParameterTable.getActiveColumnVisibility().defaultValue()"></div>
                 <div class="dropdown-item" data-bind="click:function(){ParameterTable.getActiveColumnVisibility().toggleDescription()}"><span>Description</span><input type="checkbox" data-bind="checked:ParameterTable.getActiveColumnVisibility().description()"></div>
                 <div class="dropdown-item" data-bind="click:function(){ParameterTable.getActiveColumnVisibility().toggleType()}"><span>Type</span><input type="checkbox" data-bind="checked:ParameterTable.getActiveColumnVisibility().type()"></div>
                 <div class="dropdown-item" data-bind="click:function(){ParameterTable.getActiveColumnVisibility().toggleFlags()}"><span>Flags</span><input type="checkbox" data-bind="checked:ParameterTable.getActiveColumnVisibility().flags()"></div>
@@ -118,13 +117,6 @@ <h5 class="bottomWindowHeader">Node Fields Table: <span>(No selection)</span></h
                                             <div data-bind="click: function() { },clickBubble: false, css: {resizer: ParameterTable.setUpColumnResizer('parameter_table_value') === true}"></div>
                                         </th>
                                     <!-- /ko -->
-                                    <!-- ko if: ParameterTable.getActiveColumnVisibility().defaultValue() -->
-                                        <th class="parameter_table_default_value" data-bind="click: function(){ParameterTable.sortTableBy('defaultValue')}, eagleTooltip:'The default value of this parameter before user modifications'" data-bs-placement="top">
-                                            <i id="tableSort_defaultValue" class="md-18 tableSortIcon icon-tableSortNone"></i>
-                                            Default Value
-                                            <div data-bind="click: function() { },clickBubble: false, css: {resizer: ParameterTable.setUpColumnResizer('parameter_table_default_value') === true}"></div>
-                                        </th>
-                                    <!-- /ko -->
                                     <!-- ko if: ParameterTable.getActiveColumnVisibility().description() -->
                                         <th class="parameter_table_description" data-bind="click: function(){ParameterTable.sortTableBy('description')}, eagleTooltip:'A description of the purpose of this parameter'" data-bs-placement="top">
                                             <i id="tableSort_description" class="md-18 tableSortIcon icon-tableSortNone"></i>
@@ -286,58 +278,6 @@ <h5 class="bottomWindowHeader">Node Fields Table: <span>(No selection)</span></h
                                                 </td>
                                             <!-- /ko -->
                                              
-<!-- default value cell -->
- 
-                                            <!-- ko if: ParameterTable.getActiveColumnVisibility().defaultValue() -->
-                                                <td class='columnCell column_DefaultValue' data-bind="css: {selectedTableParameter: ParameterTable.isSelected('defaultValue', $data) }">
-
-                                                    <!-- integer -->
-                                                    <!-- ko if: $data.isIntegerValueType() -->
-                                                        <input class="tableParameter" type="number" step="1" onfocus="this.previousValue = this.value" onkeydown="this.previousValue = this.value" oninput="validity.valid || (value = this.previousValue)" data-bind="disabled: ParameterTable.getNodeLockedState($data), valueUpdate: ['afterkeydown', 'input'], value: defaultValue, event: {change: ParameterTable.fieldValueChanged, keyup: function(event, data){ParameterTable.select($data.defaultValue(), 'defaultValue', $data, $index())}, click: function(event, data){ParameterTable.select($data.defaultValue(), 'defaultValue', $data, $index())}}">
-                                                    <!-- /ko -->
-
-                                                    <!-- ko if: $data.isFloatValueType() -->
-                                                        <input class="tableParameter" type="number"  step="0.1" data-bind="disabled: ParameterTable.getNodeLockedState($data), valueUpdate: ['afterkeydown', 'input'], value: defaultValue, event: {change: ParameterTable.fieldValueChanged, keyup: function(event, data){ParameterTable.select($data.defaultValue(), 'defaultValue', $data, $index())}, click: function(event, data){ParameterTable.select($data.defaultValue(), 'defaultValue', $data, $index())}}">
-                                                    <!-- /ko -->
-
-                                                    <!-- string -->
-                                                    <!-- ko if: $data.isStringValueType() -->
-                                                        <textarea  style="resize: none;" type="text" class="tableParameter inputNoArrows" data-bind="disabled: ParameterTable.getNodeLockedState($data), valueUpdate: ['afterkeydown', 'input'], value: defaultValue, event: {change: ParameterTable.fieldValueChanged, keyup: function(event, data){ParameterTable.select($data.defaultValue(), 'defaultValue', $data, $index())}, click: function(event, data){ParameterTable.select($data.defaultValue(), 'defaultValue', $data, $index())}}"></textarea>
-                                                        <button class="parameterTableEditParam icon-pencil iconHoverEffect" data-bind="click:function(data,event){ParameterTable.requestEditValueField($data, true)}"></button>
-                                                    <!-- /ko -->
-                                                     
-                                                    <!-- boolean -->
-                                                    <!-- ko if: $data.isBooleanValueType() -->
-                                                        <input class="tableParameter" tabindex='-1' type="checkbox" onclick="$(this).val(this.checked ? true : false)" data-bind="checked: valIsTrue($data.defaultValue()), disabled: ParameterTable.getNodeLockedState($data), valueUpdate: ['afterkeydown', 'input'], value: defaultValue, event: {change: ParameterTable.fieldValueChanged}">
-                                                    <!-- /ko -->
-
-                                                    <!-- selection input -->
-                                                    <!-- ko if: $data.isSelectValueType() -->
-                                                        <!-- ko ifnot: Setting.findValue(Setting.ALLOW_COMPONENT_EDITING) -->
-                                                            <select aria-label="Label" aria-describedby="group-addon" data-bs-placement="bottom" data-bind="disabled: ParameterTable.getNodeLockedState($data), event: {change: ParameterTable.fieldValueChanged}, options: $data.options, value: $data.defaultValue">
-                                                                <!-- options are added dynamically -->
-                                                            </select>
-                                                        <!-- /ko -->
-                                                        <!-- ko if: Setting.findValue(Setting.ALLOW_COMPONENT_EDITING) -->
-                                                            <div class="dropdown parameterTableTypeCustomSelect">
-                                                                <a class="dropdown-toggle dropdown-control" data-bind="text:$data.defaultValue, disabled: ParameterTable.getNodeLockedState($data)" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></a>
-                                                                <div class="dropdown-menu dropdown-menu-right dropdown-area" aria-labelledby="parameterTableTpeCustomSelect" data-bind="event:{mousewheel: $root.slowScroll}">
-                                                                    <!-- ko foreach:$data.options()-->
-                                                                        <div class="dropdown-item" data-bind="click:function(data, event){$parent.setDefaultValue($data);}">
-                                                                            <input data-bind="value:$data, event: {change:function(data,event){$parent.editOption($index(),$(event.target).val())}}" type="text">
-                                                                            <button class="typeSelectDelete" data-bind="clickBubble:false, click: function(){$parent.removeOption($index())}"><i class="material-symbols-outlined md-24 iconHoverEffect">delete</i></button>
-                                                                        </div>
-                                                                    <!-- /ko -->
-                                                                    <div class="dropdown-item add" data-bind="click:function(data,event){event.stopPropagation();addOption('')}">
-                                                                        <i class="material-symbols-outlined iconHoverEffect">add</i>
-                                                                    </div>
-                                                                </div>
-                                                            </div>
-                                                        <!-- /ko -->
-                                                    <!-- /ko -->
-                                                </td>
-                                            <!-- /ko -->
-                                             
 <!-- description cell -->
  
                                             <!-- ko if: ParameterTable.getActiveColumnVisibility().description() -->
@@ -493,7 +433,6 @@ <h5 class="bottomWindowHeader">Node Fields Table: <span>(No selection)</span></h
  
                                             <!-- ko if: ParameterTable.getActiveColumnVisibility().actions() -->
                                                 <td class="columnCell column_Actions">
-                                                    <button class="resetDefaults iconHoverEffect" onclick="$(this).val(this.checked ? true : false)" data-bind="click: function(){$data.resetToDefault();$root.selectedObjects.valueHasMutated();$root.flagActiveFileModified();}, disabled: ParameterTable.getCurrentParamReadonly($data), eagleTooltip:'Reset To Default'"><i class="material-symbols-outlined">upload_file</i></button>
                                                     <!-- ko ifnot: ParameterTable.getNodeLockedState($data) -->
                                                         <button class="edit iconHoverEffect" onclick="$(this).val(this.checked ? true : false)" data-bind="click: $root.editField, disabled: ParameterTable.getCurrentParamReadonly($data), eagleTooltip:'Edit'"><i class="material-symbols-outlined">edit</i></button>
                                                         <button class="duplicate iconHoverEffect" onclick="$(this).val(this.checked ? true : false)" data-bind="click: ParameterTable.duplicateTableRow, disabled: ParameterTable.getNodeLockedState($data), eagleTooltip:'Duplicate'"><i class="material-symbols-outlined">content_copy</i></button>