diff --git a/doc/distrib/NodeHelpFiles/CoreNodeModels.DefineData.dyn b/doc/distrib/NodeHelpFiles/CoreNodeModels.DefineData.dyn
deleted file mode 100644
index 0dcb034bc52..00000000000
--- a/doc/distrib/NodeHelpFiles/CoreNodeModels.DefineData.dyn
+++ /dev/null
@@ -1,341 +0,0 @@
-{
-  "Uuid": "ff205ac3-d314-4c24-b8d1-ec0f3dfbf011",
-  "IsCustomNode": false,
-  "Description": "",
-  "Name": "DataInput",
-  "ElementResolver": {
-    "ResolutionMap": {
-      "Point": {
-        "Key": "Autodesk.DesignScript.Geometry.Point",
-        "Value": "ProtoGeometry.dll"
-      }
-    }
-  },
-  "Inputs": [],
-  "Outputs": [],
-  "Nodes": [
-    {
-      "ConcreteType": "Dynamo.Graph.Nodes.CodeBlockNodeModel, DynamoCore",
-      "Id": "8401fd3e60434531b5596bdd2c6e589b",
-      "NodeType": "CodeBlockNode",
-      "Inputs": [],
-      "Outputs": [
-        {
-          "Id": "9b30fc26c18e4819a7a5341cccb36f3e",
-          "Name": "",
-          "Description": "Value of expression at line 1",
-          "UsingDefaultValue": false,
-          "Level": 2,
-          "UseLevels": false,
-          "KeepListStructure": false
-        },
-        {
-          "Id": "b30bed9bad604a6ea2f8205a7e004c7c",
-          "Name": "",
-          "Description": "Value of expression at line 2",
-          "UsingDefaultValue": false,
-          "Level": 2,
-          "UseLevels": false,
-          "KeepListStructure": false
-        },
-        {
-          "Id": "2e60244c94b5438fb842b3073850da08",
-          "Name": "",
-          "Description": "Value of expression at line 3",
-          "UsingDefaultValue": false,
-          "Level": 2,
-          "UseLevels": false,
-          "KeepListStructure": false
-        },
-        {
-          "Id": "b42b8ba327964cbca39d468cdf28fa52",
-          "Name": "",
-          "Description": "Value of expression at line 4",
-          "UsingDefaultValue": false,
-          "Level": 2,
-          "UseLevels": false,
-          "KeepListStructure": false
-        },
-        {
-          "Id": "704fbc82904648679ad503a1c72ededb",
-          "Name": "",
-          "Description": "Value of expression at line 5",
-          "UsingDefaultValue": false,
-          "Level": 2,
-          "UseLevels": false,
-          "KeepListStructure": false
-        },
-        {
-          "Id": "be37aef4ed8e413a94b1535213282bd9",
-          "Name": "",
-          "Description": "Value of expression at line 6",
-          "UsingDefaultValue": false,
-          "Level": 2,
-          "UseLevels": false,
-          "KeepListStructure": false
-        }
-      ],
-      "Replication": "Disabled",
-      "Description": "Allows for DesignScript code to be authored directly",
-      "Code": "\"The quick brown fox jumps over the lazy dog\";\n1;\n21.1;\nfalse;\nPoint.ByCoordinates(0,0,0);\n[1,2,3,4,5];"
-    },
-    {
-      "ConcreteType": "CoreNodeModels.DefineData, CoreNodeModels",
-      "IsAutoMode": false,
-      "IsList": false,
-      "DisplayValue": "Number",
-      "SelectedIndex": 15,
-      "SelectedString": "Number",
-      "Id": "341b49997a5740cfa4470fda4c145392",
-      "NodeType": "ExtensionNode",
-      "Inputs": [
-        {
-          "Id": "ce9252aa515a489790b48664611de307",
-          "Name": ">",
-          "Description": "Input data to be validated",
-          "UsingDefaultValue": false,
-          "Level": 2,
-          "UseLevels": false,
-          "KeepListStructure": false
-        }
-      ],
-      "Outputs": [
-        {
-          "Id": "1260ee19254c45848bbbd43331b8e790",
-          "Name": ">",
-          "Description": "Data if validation is successful",
-          "UsingDefaultValue": false,
-          "Level": 2,
-          "UseLevels": false,
-          "KeepListStructure": false
-        }
-      ],
-      "Replication": "Disabled",
-      "Description": "Validates and returns data from a currently or previously connected node"
-    },
-    {
-      "ConcreteType": "CoreNodeModels.DefineData, CoreNodeModels",
-      "IsAutoMode": true,
-      "IsList": true,
-      "DisplayValue": "Integer",
-      "SelectedIndex": 16,
-      "SelectedString": "Integer",
-      "Id": "b0263a5695eb46bea670edba50703bbd",
-      "NodeType": "ExtensionNode",
-      "Inputs": [
-        {
-          "Id": "53fc0ceb63c64b53807f6aa6cdca79ec",
-          "Name": ">",
-          "Description": "Input data to be validated",
-          "UsingDefaultValue": false,
-          "Level": 2,
-          "UseLevels": false,
-          "KeepListStructure": false
-        }
-      ],
-      "Outputs": [
-        {
-          "Id": "5c2b05f6b2b54795bd50642d1d8232cd",
-          "Name": ">",
-          "Description": "Data if validation is successful",
-          "UsingDefaultValue": false,
-          "Level": 2,
-          "UseLevels": false,
-          "KeepListStructure": false
-        }
-      ],
-      "Replication": "Disabled",
-      "Description": "Validates and returns data from a currently or previously connected node"
-    },
-    {
-      "ConcreteType": "CoreNodeModels.DefineData, CoreNodeModels",
-      "IsAutoMode": false,
-      "IsList": false,
-      "DisplayValue": "Number",
-      "SelectedIndex": 15,
-      "SelectedString": "Number",
-      "Id": "a4116564c3564028a6461282b498d62e",
-      "NodeType": "ExtensionNode",
-      "Inputs": [
-        {
-          "Id": "d507fd9590e242ccb8c1b6347b350bd2",
-          "Name": ">",
-          "Description": "Input data to be validated",
-          "UsingDefaultValue": false,
-          "Level": 2,
-          "UseLevels": false,
-          "KeepListStructure": false
-        }
-      ],
-      "Outputs": [
-        {
-          "Id": "b8a74f4ba05342e99e2aca0f5a11d4db",
-          "Name": ">",
-          "Description": "The selected >",
-          "UsingDefaultValue": false,
-          "Level": 2,
-          "UseLevels": false,
-          "KeepListStructure": false
-        }
-      ],
-      "Replication": "Disabled",
-      "Description": "Validates and returns data from a currently or previously connected node"
-    }
-  ],
-  "Connectors": [
-    {
-      "Start": "9b30fc26c18e4819a7a5341cccb36f3e",
-      "End": "ce9252aa515a489790b48664611de307",
-      "Id": "4ec42a40e52a47e793b3f2c58f5efa41",
-      "IsHidden": "False"
-    },
-    {
-      "Start": "2e60244c94b5438fb842b3073850da08",
-      "End": "d507fd9590e242ccb8c1b6347b350bd2",
-      "Id": "1184bb5532c44f59adbd67e7a42f3d67",
-      "IsHidden": "False"
-    },
-    {
-      "Start": "be37aef4ed8e413a94b1535213282bd9",
-      "End": "53fc0ceb63c64b53807f6aa6cdca79ec",
-      "Id": "3e7415930d584f95bd4fe9d92f9c71f0",
-      "IsHidden": "False"
-    }
-  ],
-  "Dependencies": [],
-  "NodeLibraryDependencies": [],
-  "EnableLegacyPolyCurveBehavior": true,
-  "Thumbnail": "",
-  "GraphDocumentationURL": null,
-  "ExtensionWorkspaceData": [
-    {
-      "ExtensionGuid": "28992e1d-abb9-417f-8b1b-05e053bee670",
-      "Name": "Properties",
-      "Version": "3.1",
-      "Data": {}
-    }
-  ],
-  "Author": "",
-  "Linting": {
-    "activeLinter": "None",
-    "activeLinterId": "7b75fb44-43fd-4631-a878-29f4d5d8399a",
-    "warningCount": 0,
-    "errorCount": 0
-  },
-  "Bindings": [],
-  "View": {
-    "Dynamo": {
-      "ScaleFactor": 1.0,
-      "HasRunWithoutCrash": true,
-      "IsVisibleInDynamoLibrary": true,
-      "Version": "3.1.0.3411",
-      "RunType": "Automatic",
-      "RunPeriod": "1000"
-    },
-    "Camera": {
-      "Name": "_Background Preview",
-      "EyeX": -17.0,
-      "EyeY": 24.0,
-      "EyeZ": 50.0,
-      "LookX": 12.0,
-      "LookY": -13.0,
-      "LookZ": -58.0,
-      "UpX": 0.0,
-      "UpY": 1.0,
-      "UpZ": 0.0
-    },
-    "ConnectorPins": [],
-    "NodeViews": [
-      {
-        "Id": "8401fd3e60434531b5596bdd2c6e589b",
-        "Name": "Code Block",
-        "IsSetAsInput": false,
-        "IsSetAsOutput": false,
-        "Excluded": false,
-        "ShowGeometry": true,
-        "X": -89.08466029404468,
-        "Y": 164.48711803028766
-      },
-      {
-        "Id": "341b49997a5740cfa4470fda4c145392",
-        "Name": "DefineData",
-        "IsSetAsInput": false,
-        "IsSetAsOutput": false,
-        "Excluded": false,
-        "ShowGeometry": true,
-        "X": 504.79869346839416,
-        "Y": 62.116295816353556
-      },
-      {
-        "Id": "b0263a5695eb46bea670edba50703bbd",
-        "Name": "DefineData",
-        "IsSetAsInput": false,
-        "IsSetAsOutput": false,
-        "Excluded": false,
-        "ShowGeometry": true,
-        "X": 508.6923454366158,
-        "Y": 416.6206473722925
-      },
-      {
-        "Id": "a4116564c3564028a6461282b498d62e",
-        "Name": "DefineData",
-        "IsSetAsInput": false,
-        "IsSetAsOutput": false,
-        "Excluded": false,
-        "ShowGeometry": true,
-        "X": 503.5451066974623,
-        "Y": -146.65588355581608
-      }
-    ],
-    "Annotations": [
-      {
-        "Id": "0ca2413e63fe4db79a09078c5ede2480",
-        "Title": "Automatic validation is locked",
-        "DescriptionText": "when in this mode, the node only accepts valid data.",
-        "IsExpanded": true,
-        "WidthAdjustment": 0.0,
-        "HeightAdjustment": 0.0,
-        "Nodes": [
-          "341b49997a5740cfa4470fda4c145392",
-          "a4116564c3564028a6461282b498d62e"
-        ],
-        "HasNestedGroups": false,
-        "Left": 493.5451066974623,
-        "Top": -262.6558835558161,
-        "Width": 359.25358677093186,
-        "Height": 491.77217937216966,
-        "FontSize": 36.0,
-        "GroupStyleId": "00000000-0000-0000-0000-000000000000",
-        "InitialTop": -146.65588355581608,
-        "InitialHeight": 351.8500604167258,
-        "TextblockHeight": 106.0,
-        "Background": "#FFC1D676"
-      },
-      {
-        "Id": "bd2fd81958024114a3437c340f1b0135",
-        "Title": "Automatic validation is unlocked",
-        "DescriptionText": "The node will automatically set the matching data type.",
-        "IsExpanded": true,
-        "WidthAdjustment": 0.0,
-        "HeightAdjustment": 0.0,
-        "Nodes": [
-          "b0263a5695eb46bea670edba50703bbd"
-        ],
-        "HasNestedGroups": false,
-        "Left": 498.6923454366158,
-        "Top": 300.6206473722925,
-        "Width": 358.0,
-        "Height": 271.0,
-        "FontSize": 36.0,
-        "GroupStyleId": "00000000-0000-0000-0000-000000000000",
-        "InitialTop": 416.6206473722925,
-        "InitialHeight": 185.0,
-        "TextblockHeight": 106.0,
-        "Background": "#FFC1D676"
-      }
-    ],
-    "X": 258.29615881197935,
-    "Y": 328.38191913885566,
-    "Zoom": 0.994488700419556
-  }
-}
\ No newline at end of file
diff --git a/doc/distrib/NodeHelpFiles/CoreNodeModels.DefineData.md b/doc/distrib/NodeHelpFiles/CoreNodeModels.DefineData.md
deleted file mode 100644
index f03f79ed830..00000000000
--- a/doc/distrib/NodeHelpFiles/CoreNodeModels.DefineData.md
+++ /dev/null
@@ -1,9 +0,0 @@
-## In Depth
-
-Validates and returns data from a currently or previously connected input node.
-
----
-
-## Example File
-
-![Define_Data](./CoreNodeModels.DefineData_img.jpg)
diff --git a/doc/distrib/NodeHelpFiles/CoreNodeModels.DefineData_img.jpg b/doc/distrib/NodeHelpFiles/CoreNodeModels.DefineData_img.jpg
deleted file mode 100644
index 7f90111a5a0..00000000000
Binary files a/doc/distrib/NodeHelpFiles/CoreNodeModels.DefineData_img.jpg and /dev/null differ
diff --git a/src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml b/src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml
index 474efa30ab6..abf88c0e770 100644
--- a/src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml
+++ b/src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml
@@ -489,136 +489,6 @@
         </Setter>
         <Style.Triggers />
     </Style>
-
-
-    <!-- NodeView c ustomization styles --> 
-    <ControlTemplate x:Key="NodeViewComboBoxToggleButton" TargetType="ToggleButton">
-        <Grid>
-            <Border x:Name="Border"
-                    Background="#2a2a2a"
-                    BorderThickness="0"/>
-            <Path x:Name="Arrow"
-                  Margin="0 0 5 0"
-                  HorizontalAlignment="Right"
-                  VerticalAlignment="Center"
-                  Data="M 0 0 L 4 4 L 8 0 Z"
-                  Fill="#999" />
-        </Grid>
-        <ControlTemplate.Triggers>
-            <Trigger Property="ToggleButton.IsMouseOver"
-                     Value="true">
-                <Setter TargetName="Arrow"
-                        Property="Fill"
-                        Value="#fff" />
-            </Trigger>
-        </ControlTemplate.Triggers>
-    </ControlTemplate>
-    
-    <Style x:Key="NodeViewComboBox" TargetType="{x:Type ComboBox}">
-        <Setter Property="SnapsToDevicePixels" Value="true" />
-        <Setter Property="OverridesDefaultStyle" Value="true" />
-        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
-        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
-        <Setter Property="ScrollViewer.CanContentScroll" Value="true" />
-        <Setter Property="MinWidth" Value="40" />
-        <Setter Property="Padding" Value="5 0" />
-        <Setter Property="MinHeight" Value="20" />
-        <Setter Property="MaxHeight" Value="30" />
-        <Setter Property="FontSize" Value="10" />
-        <Setter Property="Foreground" Value="#C7C7C7" />
-        <Setter Property="ItemContainerStyle" Value="{DynamicResource PackageManagerComboBoxItemStyle}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="ComboBox">
-                    <Grid>
-                        <ToggleButton Name="ToggleButton"   
-                                      Grid.Column="2"
-                                      ClickMode="Press"
-                                      Focusable="false"
-                                      IsChecked="{Binding Path=IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
-                                      Template="{DynamicResource NodeViewComboBoxToggleButton}" />
-                        <ContentPresenter Name="ContentSite"
-                                          Margin="5,3,12,3"
-                                          HorizontalAlignment="Left"
-                                          VerticalAlignment="Center"
-                                          Content="{TemplateBinding SelectionBoxItem}"
-                                          ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
-                                          ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}"
-                                          IsHitTestVisible="False" />
-                        <TextBox x:Name="PART_EditableTextBox"
-                                 Margin="3,3,23,3"
-                                 Padding="10"
-                                 HorizontalAlignment="Left"
-                                 VerticalAlignment="Center"
-                                 Background="#2a2a2a"
-                                 CaretBrush="#bbbbbb"
-                                 Focusable="True"
-                                 Foreground="#bbbbbb"
-                                 IsReadOnly="{TemplateBinding IsReadOnly}"
-                                 Style="{x:Null}"
-                                 Template="{StaticResource ComboBoxTextBox}"
-                                 Visibility="Hidden" />
-                        <Popup Name="Popup"
-                               AllowsTransparency="True"
-                               Focusable="False"
-                               IsOpen="{TemplateBinding IsDropDownOpen}"
-                               Placement="Bottom"
-                               PopupAnimation="Slide">
-                            <Grid Name="DropDown"
-                                  MinWidth="{TemplateBinding ActualWidth}"
-                                  MaxHeight="{TemplateBinding MaxDropDownHeight}"
-                                  SnapsToDevicePixels="True">
-                                <Border x:Name="DropDownBorder"
-                                        Background="#2a2a2a"
-                                        BorderBrush="Transparent"
-                                        BorderThickness="0" />
-                                <ScrollViewer Margin="0,6,0,6"
-                                              SnapsToDevicePixels="True">
-                                    <StackPanel IsItemsHost="True"
-                                                KeyboardNavigation.DirectionalNavigation="Contained" />
-                                </ScrollViewer>
-                            </Grid>
-                        </Popup>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="HasItems"
-                                 Value="false">
-                            <Setter TargetName="DropDownBorder"
-                                    Property="MinHeight"
-                                    Value="95" />
-                        </Trigger>
-                        <Trigger Property="IsGrouping"
-                                 Value="true">
-                            <Setter Property="ScrollViewer.CanContentScroll"
-                                    Value="false" />
-                        </Trigger>
-                        <Trigger SourceName="Popup"
-                                 Property="Popup.AllowsTransparency"
-                                 Value="true">
-                            <Setter TargetName="DropDownBorder"
-                                    Property="CornerRadius"
-                                    Value="0" />
-                            <Setter TargetName="DropDownBorder"
-                                    Property="Margin"
-                                    Value="0,0,0,0" />
-                        </Trigger>
-                        <Trigger Property="IsEditable"
-                                 Value="true">
-                            <Setter Property="IsTabStop"
-                                    Value="false" />
-                            <Setter TargetName="PART_EditableTextBox"
-                                    Property="Visibility"
-                                    Value="Visible" />
-                            <Setter TargetName="ContentSite"
-                                    Property="Visibility"
-                                    Value="Hidden" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-        <Style.Triggers />
-    </Style>
     <!-- End Package Manager Styles -->
     <Style x:Key="SComboBox_Update" TargetType="{x:Type ComboBox}">
         <Setter Property="SnapsToDevicePixels" Value="true" />
diff --git a/src/Libraries/CoreNodeModels/DefineData.cs b/src/Libraries/CoreNodeModels/DefineData.cs
deleted file mode 100644
index a3424f37342..00000000000
--- a/src/Libraries/CoreNodeModels/DefineData.cs
+++ /dev/null
@@ -1,161 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Runtime.Serialization;
-using DSCore;
-using Dynamo.Graph.Nodes;
-using Newtonsoft.Json;
-using ProtoCore.AST.AssociativeAST;
-using VMDataBridge;
-
-
-namespace CoreNodeModels
-{
-    [NodeName("DefineData")]
-    [NodeDescription(nameof(Properties.Resources.RememberDescription), typeof(Properties.Resources))]
-    [NodeCategory("Core.Data")]
-    [InPortNames(">")]
-    [InPortTypes("var[]..[]")]
-    [InPortDescriptions(typeof(Properties.Resources),
-        nameof(Properties.Resources.RememberInputToolTip))]
-    [OutPortNames(">")]
-    [OutPortTypes("var[]..[]")]
-    [OutPortDescriptions(typeof(Properties.Resources), nameof(Properties.Resources.RememberOuputToolTip))]
-    [IsDesignScriptCompatible]
-    public class DefineData : DSDropDownBase
-    {
-        private bool context;
-        private List<DynamoDropDownItem> serializedItems;
-
-        [JsonProperty]
-        public bool IsList { get; set; }
-
-        /// <summary>
-        /// Copy of <see cref="DSDropDownBase.Items"/> to be serialized./>
-        /// </summary>
-        [JsonProperty]
-        protected List<DynamoDropDownItem> SerializedItems
-        {
-            get => serializedItems;
-            set
-            {
-                serializedItems = value;
-
-                Items.Clear();
-
-                foreach (DynamoDropDownItem item in serializedItems)
-                {
-                    Items.Add(item);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Construct a new DefineData Dropdown Menu node
-        /// </summary>
-        public DefineData() : base(">")
-        {
-            RegisterAllPorts();
-            PropertyChanged += OnPropertyChanged;
-
-            foreach (var dataType in Data.GetDataNodeDynamoTypeList())
-            {
-                var displayName = dataType.Name;
-                var value = dataType;
-
-                Items.Add(new DynamoDropDownItem(displayName, value));
-            }
-
-            SelectedIndex = 0;
-        }
-
-        [JsonConstructor]
-        private DefineData(IEnumerable<PortModel> inPorts, IEnumerable<PortModel> outPorts) : base(">", inPorts, outPorts)
-        {
-            PropertyChanged += OnPropertyChanged;
-        }
-
-        private void OnPropertyChanged(object sender, PropertyChangedEventArgs e)
-        {
-
-        }
-
-        protected override void OnBuilt()
-        {
-            base.OnBuilt();
-            DataBridge.Instance.RegisterCallback(GUID.ToString(), DataBridgeCallback);
-        }
-
-        public override void Dispose()
-        {
-            PropertyChanged -= OnPropertyChanged;
-            base.Dispose();
-            DataBridge.Instance.UnregisterCallback(GUID.ToString());
-        }
-
-        public override IEnumerable<AssociativeNode> BuildOutputAst(List<AssociativeNode> inputAstNodes)
-        {
-            var resultAst = new List<AssociativeNode>();
-
-            // function call inputs - reference to the function, and the function arguments coming from the inputs
-            // the object to be (type) evaluated
-            // the expected datatype
-            // if the input is an ArrayList or not
-            var function = new Func<object, string, bool, bool>(DSCore.Data.IsSupportedDataNodeDynamoType);
-            var funtionInputs = new List<AssociativeNode> {
-                inputAstNodes[0],
-                AstFactory.BuildStringNode((Items[SelectedIndex].Item as Data.DataNodeDynamoType).Type.ToString()),
-                AstFactory.BuildBooleanNode(IsList) };
-
-
-            var functionCall = AstFactory.BuildFunctionCall(function, funtionInputs);
-            var functionCallIdentifier = AstFactory.BuildIdentifier(GUID + "_func");
-
-            // build the function call
-            resultAst.Add(AstFactory.BuildAssignment(functionCallIdentifier, functionCall));
-
-            // build the output call
-            resultAst.Add(AstFactory.BuildAssignment(GetAstIdentifierForOutputIndex(0), functionCall));
-
-            // build the call for the DataBridge 
-            resultAst.Add(AstFactory.BuildAssignment(functionCallIdentifier,
-                DataBridge.GenerateBridgeDataAst(GUID.ToString(),
-                AstFactory.BuildExprList(inputAstNodes))));
-
-
-            return resultAst;
-        }
-
-
-        /// <summary>
-        /// Not sure at the moment how relevant is the databridge for this node type 
-        /// </summary>
-        /// <param name="data"></param>
-        private void DataBridgeCallback(object data)
-        {
-            var inputs = data as ArrayList;
-
-            var inputObject = inputs[0];
-
-            if (!InPorts[0].IsConnected)
-            {
-                return;
-            }
-
-        }
-
-
-        protected override SelectionState PopulateItemsCore(string currentSelection)
-        {
-            return SelectionState.Restore;
-        }
-
-        [OnSerializing]
-        private void OnSerializing(StreamingContext context)
-        {
-            serializedItems = Items.ToList();
-        }
-    }
-}
diff --git a/src/Libraries/CoreNodeModelsWpf/Controls/DefineDataControl.xaml b/src/Libraries/CoreNodeModelsWpf/Controls/DefineDataControl.xaml
deleted file mode 100644
index e24865162eb..00000000000
--- a/src/Libraries/CoreNodeModelsWpf/Controls/DefineDataControl.xaml
+++ /dev/null
@@ -1,81 +0,0 @@
-<UserControl x:Class="CoreNodeModelsWpf.Controls.DefineDataControl"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:p="clr-namespace:Dynamo.Wpf.Properties"
-             xmlns:core="clr-namespace:Dynamo.Nodes;assembly=DynamoCoreWpf"
-             xmlns:ui="clr-namespace:Dynamo.UI;assembly=DynamoCoreWpf"
-             mc:Ignorable="d" 
-             d:DesignHeight="200" d:DesignWidth="350">
-    <UserControl.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ui:SharedResourceDictionary Source="{x:Static ui:SharedDictionaryManager.DynamoModernDictionaryUri}" />
-                <ui:SharedResourceDictionary Source="{x:Static ui:SharedDictionaryManager.DynamoConvertersDictionaryUri}" />
-                <ui:SharedResourceDictionary Source="{x:Static ui:SharedDictionaryManager.DynamoColorsAndBrushesDictionaryUri}" />
-            </ResourceDictionary.MergedDictionaries>
-            <SolidColorBrush x:Key="StrokeBrush" Color="#999999 " />
-            
-            <PathGeometry x:Key="QuestionIcon" Figures="M8 0C3.58172 0 0 3.58172 0 8C0 12.4183 3.58172 16 8 16C12.4183 16 16 12.4183 16 8C16 5.87827 15.1571 3.84344 13.6569 2.34315C12.1566 0.842855 10.1217 0 8 0ZM9 14H7V12H9V14ZM10 8.45C9.38 8.74 9 8.95 9 9.45V11H7V8.92C6.97651 8.37388 7.19188 7.84457 7.59 7.47C8.05 7.06 9.75 6.56 9.75 5.59C9.75 5 9.45 4.33 8.23 4.33C6.75 4.33 6.23 6.66 6.23 6.66L4.45 6.25C4.45 6.25 4.86 2.39 8.25 2.39C9.13189 2.33809 9.99827 2.63874 10.6584 3.22576C11.3186 3.81279 11.7185 4.63809 11.77 5.52C11.8034 6.75866 11.1119 7.90321 10 8.45Z"/>
-            <PathGeometry x:Key="PadlockIcon" Figures="M 35 7 C 30.038 7 26 11.038 26 16 L 26 20 L 9 20 C 7.343 20 6 21.343 6 23 L 6 38 C 6 39.657 7.343 41 9 41 L 27 41 C 28.657 41 30 39.657 30 38 L 30 23 C 30 21.343 28.657 20 27 20 L 27 16 C 27 11.589 30.589 8 35 8 C 39.411 8 43 11.589 43 16 L 43 20.5 C 43 20.776 43.224 21 43.5 21 C 43.776 21 44 20.776 44 20.5 L 44 16 C 44 11.038 39.962 7 35 7 z M 9 21 L 27 21 C 28.105 21 29 21.895 29 23 L 29 38 C 29 39.105 28.105 40 27 40 L 9 40 C 7.895 40 7 39.105 7 38 L 7 23 C 7 21.895 7.895 21 9 21 z"/>
-        </ResourceDictionary>
-    </UserControl.Resources>
-    <DockPanel VerticalAlignment="Bottom">
-        <ToggleButton VerticalAlignment="Center"
-                        Width="30"
-                        Height="15"
-                        Margin="2,0,0,0"
-                        IsEnabled="True"
-                        IsChecked="{Binding Path=StaticSplashScreenEnabled}"
-                        Style="{StaticResource EllipseToggleButton1}"/>
-        <Label Content="List"
-                Margin="4 0"    
-                Foreground="{StaticResource PreferencesWindowFontColor}"/>
-        <Canvas VerticalAlignment="Center" Width="14" Height="14">
-            <Viewbox Width="14" Height="14">
-                <Path x:Name="ExpandPath" Data="{StaticResource QuestionIcon}"
-                      Fill="{StaticResource StrokeBrush}"
-                      Stroke="{StaticResource StrokeBrush}">
-                </Path>                    
-            </Viewbox>
-            <Canvas.ToolTip>
-                <ToolTip Content="Fill in later"
-                            Style="{StaticResource GenericToolTipLight}"/>
-            </Canvas.ToolTip>
-        </Canvas>
-
-        <Button Margin="0 0 10 3"
-                x:Name="LockButton"
-                BorderThickness="0"
-                HorizontalAlignment="Right"
-                VerticalAlignment="Center"
-                Cursor="Hand">
-            <Button.ToolTip>
-                <ToolTip Content="Lock tooltup"
-                            Style="{StaticResource GenericToolTipLight}" />
-            </Button.ToolTip>
-            <Button.Template>
-                <ControlTemplate TargetType="Button">
-                    <Border Background="Transparent">
-                        <Viewbox Width="16"
-                                 Height="16"
-                                 VerticalAlignment="Center">
-                            <Path x:Name="Folder"
-                                  Fill="#999999"
-                                  Data="{StaticResource PadlockIcon}"
-                                  StrokeThickness="1"
-                                  Stroke="{StaticResource StrokeBrush}">
-                            </Path>
-                        </Viewbox>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="Folder" Property="Fill" Value="#6AC0E7" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Button.Template>
-        </Button>
-    </DockPanel>
-</UserControl>
diff --git a/src/Libraries/CoreNodeModelsWpf/Controls/DefineDataControl.xaml.cs b/src/Libraries/CoreNodeModelsWpf/Controls/DefineDataControl.xaml.cs
deleted file mode 100644
index 51214bd23cb..00000000000
--- a/src/Libraries/CoreNodeModelsWpf/Controls/DefineDataControl.xaml.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System.Windows.Controls;
-using CoreNodeModels;
-
-namespace CoreNodeModelsWpf.Controls
-{
-    /// <summary>
-    /// Interaction logic for DefineDataControl.xaml
-    /// </summary>
-    public partial class DefineDataControl : UserControl
-    {
-        private readonly DefineData model;
-
-        internal ComboBox BaseComboBox { get; set; }
-
-        public DefineDataControl(DefineDataViewModel viewModel)
-        {
-            DataContext = viewModel;
-            model = viewModel.Model;
-
-            InitializeComponent();
-        }
-    }
-}
diff --git a/src/Libraries/CoreNodeModelsWpf/CoreNodeModelsWpf.csproj b/src/Libraries/CoreNodeModelsWpf/CoreNodeModelsWpf.csproj
index d495a3e0272..3a5888a6664 100644
--- a/src/Libraries/CoreNodeModelsWpf/CoreNodeModelsWpf.csproj
+++ b/src/Libraries/CoreNodeModelsWpf/CoreNodeModelsWpf.csproj
@@ -84,7 +84,6 @@
     <None Remove="Charts\Controls\PieChartControl.xaml" />
     <None Remove="Charts\Controls\ScatterPlotControl.xaml" />
     <None Remove="Charts\Controls\XYLineChartControl.xaml" />
-    <None Remove="Controls\DefineDataControl.xaml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Update="Properties\CoreNodeModelWpfResources.Designer.cs">
diff --git a/src/Libraries/CoreNodeModelsWpf/DefineDataViewModel.cs b/src/Libraries/CoreNodeModelsWpf/DefineDataViewModel.cs
deleted file mode 100644
index 8c560c87e72..00000000000
--- a/src/Libraries/CoreNodeModelsWpf/DefineDataViewModel.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using CoreNodeModels;
-using Dynamo.Core;
-
-namespace CoreNodeModelsWpf
-{
-    public class DefineDataViewModel : NotificationObject
-    {
-        public DefineData Model { get; }
-
-        public DefineDataViewModel()
-        {
-
-        }
-        public DefineDataViewModel(DefineData model)
-        {
-            Model = model;
-        }
-
-
-    }
-}
diff --git a/src/Libraries/CoreNodeModelsWpf/NodeViewCustomizations/DefineData.cs b/src/Libraries/CoreNodeModelsWpf/NodeViewCustomizations/DefineData.cs
deleted file mode 100644
index e144089c7ec..00000000000
--- a/src/Libraries/CoreNodeModelsWpf/NodeViewCustomizations/DefineData.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System.Windows;
-using System.Windows.Controls;
-using CoreNodeModels;
-using CoreNodeModelsWpf.Controls;
-using Dynamo.Controls;
-using Dynamo.Wpf;
-
-namespace CoreNodeModelsWpf.Nodes
-{
-    /// <summary>
-    /// View customizer for DefineData node model.
-    /// </summary>
-    public class DefineDataNodeViewCustomization : DropDownNodeViewCustomization, INodeViewCustomization<DefineData>
-    {
-        /// <summary>
-        /// Customize the visual appearance of the DefineData node.
-        /// </summary>
-        /// <param name="model"></param>
-        /// <param name="nodeView"></param>
-        public void CustomizeView(DefineData model, NodeView nodeView)
-        {
-            var formControl = new DefineDataControl(new DefineDataViewModel(model));
-
-            nodeView.inputGrid.Margin = new Thickness(5, 0, 5, 0);
-            nodeView.inputGrid.RowDefinitions.Add(new RowDefinition());
-            nodeView.inputGrid.RowDefinitions.Add(new RowDefinition());
-
-            Grid.SetRow(formControl, 1);
-            nodeView.inputGrid.Children.Add(formControl);
-
-            // Add the dropdown.
-            base.CustomizeView(model, nodeView);
-
-            var style = (Style)Dynamo.UI.SharedDictionaryManager.DynamoModernDictionary["NodeViewComboBox"];
-            var dropdown = (ComboBox)nodeView.inputGrid.Children[1];
-            dropdown.Style = style;
-
-            formControl.BaseComboBox = dropdown;
-
-            // Add margin to the dropdown to show the expander.
-            dropdown.Margin = new Thickness(0, 0, 0, 10);
-            dropdown.VerticalAlignment = VerticalAlignment.Top;
-            dropdown.MinWidth = 220;
-            dropdown.FontSize = 12;
-        }
-    }
-}
diff --git a/src/Libraries/CoreNodes/Data.cs b/src/Libraries/CoreNodes/Data.cs
index ccd047bf9d2..011d581df5e 100644
--- a/src/Libraries/CoreNodes/Data.cs
+++ b/src/Libraries/CoreNodes/Data.cs
@@ -1,21 +1,20 @@
+using Autodesk.DesignScript.Geometry;
 using System;
-using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
+using Autodesk.DesignScript.Runtime;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using System.Drawing;
-using System.Drawing.Imaging;
-using System.Globalization;
 using System.IO;
-using System.Linq;
+using System.Drawing.Imaging;
+using System.Collections;
 using System.Runtime.Versioning;
-using System.Text;
-using Autodesk.DesignScript.Geometry;
-using Autodesk.DesignScript.Runtime;
 using Dynamo.Events;
 using Dynamo.Logging;
 using Dynamo.Session;
-using DynamoUnits;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
+using System.Globalization;
+using System.Text;
 
 namespace DSCore
 {
@@ -529,148 +528,6 @@ public static Dictionary<string, object> Remember([ArbitraryDimensionArrayImport
         }
 
         internal static DynamoLogger dynamoLogger = ExecutionEvents.ActiveSession?.GetParameterValue(ParameterKeys.Logger) as DynamoLogger;
-        #endregion
-
-        #region Input Output Node
-
-        public class DataNodeDynamoType
-        {
-            public Type Type { get; private set; }
-            public string Name { get; private set; }
-            public DataNodeDynamoType Parent { get; private set; }
-
-            public DataNodeDynamoType(Type type, string name = null)
-            {
-                Type = type;
-                Name = name ?? type.Name;
-            }
-
-            public DataNodeDynamoType(Type type, DataNodeDynamoType parent, string name = null)
-            : this(type, name)
-            {
-                Parent = parent;
-            }
-        }
-
-
-        /// <summary>
-        /// A static dictionary for all Dynamo supported data types
-        /// </summary>
-        /// <returns>The dictionary containing the supported data types</returns>
-        public static List<DataNodeDynamoType> GetDataNodeDynamoTypeList()
-        {
-            var typeList = new List<DataNodeDynamoType>();
-            typeList.Add(new DataNodeDynamoType(typeof(bool)));
-            typeList.Add(new DataNodeDynamoType(typeof(BoundingBox)));
-            typeList.Add(new DataNodeDynamoType(typeof(CoordinateSystem)));
-
-            // Subtypes of Curve
-            var crv = new DataNodeDynamoType(typeof(Curve));
-            typeList.Add(crv);
-            typeList.Add(new DataNodeDynamoType(typeof(Arc), crv));
-            typeList.Add(new DataNodeDynamoType(typeof(Circle), crv));
-            typeList.Add(new DataNodeDynamoType(typeof(Ellipse), crv));
-            typeList.Add(new DataNodeDynamoType(typeof(EllipseArc), crv));
-            typeList.Add(new DataNodeDynamoType(typeof(Helix), crv));
-            typeList.Add(new DataNodeDynamoType(typeof(Line), crv));
-            typeList.Add(new DataNodeDynamoType(typeof(NurbsCurve), crv));
-
-            var polyCurve = new DataNodeDynamoType(typeof(PolyCurve), crv);
-            var polygon = new DataNodeDynamoType(typeof(Polygon), polyCurve);  // polygon is subtype of polyCurve
-            var rectangle = new DataNodeDynamoType(typeof(Autodesk.DesignScript.Geometry.Rectangle), polygon);    // rectangle is subtype of polygon
-
-            typeList.Add(polyCurve);
-            typeList.Add(polygon);
-            typeList.Add(rectangle);
-            typeList.Add(new DataNodeDynamoType(typeof(System.DateTime)));
-            typeList.Add(new DataNodeDynamoType(typeof(double), "Number"));
-            typeList.Add(new DataNodeDynamoType(typeof(long), "Integer"));
-            typeList.Add(new DataNodeDynamoType(typeof(Location)));
-            typeList.Add(new DataNodeDynamoType(typeof(Mesh)));
-            typeList.Add(new DataNodeDynamoType(typeof(Plane)));
-            typeList.Add(new DataNodeDynamoType(typeof(Autodesk.DesignScript.Geometry.Point)));
-
-            // Subtypes of Solid
-            var solid = new DataNodeDynamoType(typeof(Solid));
-            var cone = new DataNodeDynamoType(typeof(Cone), solid);    // cone is subtype of solid
-            var cylinder = new DataNodeDynamoType(typeof(Cylinder), cone); // cylinder is subtype of cone 
-            var cuboid = new DataNodeDynamoType(typeof(Cuboid), solid);    // cuboid is subtype of solid
-            var sphere = new DataNodeDynamoType(typeof(Sphere), solid);    // sphere is subtype of solid
-
-            typeList.Add(solid);
-            typeList.Add(cone);
-            typeList.Add(cylinder);
-            typeList.Add(cuboid);
-            typeList.Add(sphere);
-            typeList.Add(new DataNodeDynamoType(typeof(string)));
-
-            // Subtypes of Surface
-            var surface = new DataNodeDynamoType(typeof(Surface));
-            var nurbsSrf = new DataNodeDynamoType(typeof(NurbsSurface), surface);    // nurbsSrf is subtype of surface
-            var polySrf = new DataNodeDynamoType(typeof(PolySurface), surface); // polySrf is subtype of surface
-
-            typeList.Add(surface);
-            typeList.Add(nurbsSrf);
-            typeList.Add(polySrf);
-            typeList.Add(new DataNodeDynamoType(typeof(System.TimeSpan)));
-            typeList.Add(new DataNodeDynamoType(typeof(UV)));
-            typeList.Add(new DataNodeDynamoType(typeof(Vector)));
-
-            return typeList;
-        }
-
-        /// <summary>
-        /// Function to validate input type against supported Dynamo input types
-        /// </summary>
-        /// <param name="inputValue">The incoming data to validate</param>
-        /// <param name="typeString">The input type provided by the user. It has to match the inputValue type</param>
-        /// <param name="isList">The value of this boolean decides if the input is a single object or a list</param>
-        /// <returns></returns>
-        [IsVisibleInDynamoLibrary(false)]
-        public static bool IsSupportedDataNodeDynamoType([ArbitraryDimensionArrayImport] object inputValue, string typeString, bool isList)
-        {
-            var type = GetDataNodeDynamoTypeList().FirstOrDefault(x => x.Type.ToString().Equals(typeString)).Type;
-            if (type == null) { return false; } // Add exception
-            if (inputValue == null || type == null)
-            {
-                return false;   // Add exception
-            }
-
-            if (!isList)
-            {
-                if (inputValue is ArrayList) return false;  // Add exception ?
-
-                return IsItemOfType(inputValue, type);
-            }
-            else
-            {
-                if (!(inputValue is ArrayList arrayList)) return false; // Add exception ?
-
-                foreach (var item in arrayList)
-                {
-                    if (!IsItemOfType(item, type))
-                    {
-                        return false; 
-                    }
-                }
-
-                return true;
-            }
-        }
-
-        /// <summary>
-        /// This method checks if an item is of a required Dynamo DataType
-        /// 'IsInstanceOfType' recursivelly checks for upward inheritance
-        /// </summary>
-        /// <param name="item">The item to chek the data type for</param>
-        /// <param name="dataType">The DataType to check against</param>
-        /// <returns>A true or false result based on the check validation</returns>
-        private static bool IsItemOfType(object item, Type dataType)
-        {
-            if (dataType.IsInstanceOfType(item)) return true;
-            
-            return false;
-        }
 
         #endregion
     }
diff --git a/src/LibraryViewExtensionWebView2/web/library/layoutSpecs.json b/src/LibraryViewExtensionWebView2/web/library/layoutSpecs.json
index f1946b47962..1ff92374f80 100644
--- a/src/LibraryViewExtensionWebView2/web/library/layoutSpecs.json
+++ b/src/LibraryViewExtensionWebView2/web/library/layoutSpecs.json
@@ -1190,9 +1190,6 @@
                 },
                 {
                   "path": "Core.Data.Remember"
-                },
-                {
-                  "path": "Core.Data.DefineData"
                 }
               ],
               "childElements": []
diff --git a/test/DynamoCoreTests/DSCoreDataTests.cs b/test/DynamoCoreTests/DSCoreDataTests.cs
index 2306c0e1d15..4ee3955e9df 100644
--- a/test/DynamoCoreTests/DSCoreDataTests.cs
+++ b/test/DynamoCoreTests/DSCoreDataTests.cs
@@ -4,7 +4,7 @@
 using System.Drawing;
 using System.IO;
 using System.Linq;
-using Autodesk.DesignScript.Geometry;
+using System.Text;
 using Dynamo.Graph.Nodes;
 using Dynamo.Graph.Nodes.ZeroTouch;
 using DynamoUnits;
@@ -494,17 +494,17 @@ public void CanObjectBeCachedRejectsEmptyString()
 
         [Test]
         [Category("UnitTests")]
-        public void RememberRestoresFromCacheWhenPassedUnsupportedInputAndvCacheJson()
+        public void RememberRestoresFromCacheWhenPassedUnsupportedInputAndValidCacheJson()
         {
-            var vCachedJson = "2";
+            var validCachedJson = "2";
             object unsupportedInput = null;
-            var dict = DSCore.Data.Remember(unsupportedInput, vCachedJson);
+            var dict = DSCore.Data.Remember(unsupportedInput, validCachedJson);
 
             var returnObject = dict[">"];
             var returnCacheJson = dict["Cache"];
 
             Assert.AreEqual(2, returnObject);
-            Assert.AreEqual(vCachedJson, returnCacheJson);
+            Assert.AreEqual(validCachedJson, returnCacheJson);
         }
 
         [Test]
@@ -524,11 +524,11 @@ public void RememberReturnUnsupportedInputWhenPassedUnsupportedInputAndEmptyCach
 
         [Test]
         [Category("UnitTests")]
-        public void RememberWillUpdateCacheWhenPassedSupportedInputAndvCacheJson()
+        public void RememberWillUpdateCacheWhenPassedSupportedInputAndValidCacheJson()
         {
-            var vCachedJson = "2";
+            var validCachedJson = "2";
             var newInputObject = true;
-            var dict = DSCore.Data.Remember(newInputObject, vCachedJson);
+            var dict = DSCore.Data.Remember(newInputObject, validCachedJson);
 
             var returnObject = dict[">"];
             var returnCacheJson = dict["Cache"];
@@ -556,347 +556,22 @@ public void RememberWillUpdateCacheWhenPassedSupportedInputAndEmptyCacheJson()
 
         [Test]
         [Category("UnitTests")]
-        public void ThrowsWhenPassedUnsupportedInputAndInvCacheJson()
+        public void ThrowsWhenPassedUnsupportedInputAndInvalidCacheJson()
         {
-            var invCachedJson = "{\"one: 2}";
+            var invalidCachedJson = "{\"one: 2}";
             object unsupportedInput = null;
 
-            Assert.That(() => DSCore.Data.Remember(unsupportedInput, invCachedJson), Throws.Exception);
+            Assert.That(() => DSCore.Data.Remember(unsupportedInput, invalidCachedJson), Throws.Exception);
         }
 
         [Test]
         [Category("UnitTests")]
         public void ThrowsWhenPassedAnObjectThatCanNotSerialize()
         {
-            var vCachedJson = "";
+            var validCachedJson = "";
             object unsupportedInput = new FileInfo(Path.Combine(TestDirectory, @"core\json\Solid_Cylinder_JSONParsing.dyn"));
 
-            Assert.That(() => DSCore.Data.Remember(unsupportedInput, vCachedJson), Throws.Exception);
-        }
-
-
-        [Test]
-        [Category("UnitTests")]
-        [Ignore("Temp ignore, fixed in the follow-up PR")]
-        public void IsNotSupportedNullInput()
-        {
-            object nullInput = null;
-            var vType = typeof(String);
-            var invType = typeof(Nullable);
-
-            var vString = "input string";
-
-            // Assert - check for nulls - fail
-            var validate = DSCore.Data.IsSupportedDataNodeDynamoType(nullInput, vType.ToString(), false);
-            Assert.AreEqual(false, validate, "Null input should not be supported.");
-
-            validate = DSCore.Data.IsSupportedDataNodeDynamoType(vString, invType.ToString(), false);
-            Assert.AreEqual(false, validate, "Unexisting enum type should not be supported.");
-        }
-
-        [Test]
-        [Category("UnitTests")]
-        [Ignore("Temp ignore, fixed in the follow-up PR")]
-        public void IsSupportedPrimitiveDataType()
-        {
-            var vString = "input string";
-            var vInt = 5;
-            var vDouble = 3.14;
-            var vDateTime = DSCore.DateTime.ByDate(2001, 1, 1);
-            var vLocation = Location.ByLatitudeAndLongitude(50, 50);
-            var vTimeSpan = DSCore.TimeSpan.ByDateDifference(vDateTime, DSCore.DateTime.ByDate(2000, 1, 1));
-
-            var invStringList = new ArrayList() { vString, vInt, vDouble };
-            var vStringList = new ArrayList() { vString };
-            var vIntList = new ArrayList() { vInt };
-            var vDoubleList = new ArrayList() { vDouble };
-            var vDateTimeList = new ArrayList() { vDateTime };
-            var vLocationList = new ArrayList() { vLocation };
-            var vTimeSpanList = new ArrayList() { vTimeSpan };
-
-            // Assert - check list - succeed
-            var singleChecks = new Dictionary<Type, object>();
-            singleChecks[typeof(string)] = vString;
-            singleChecks[typeof(int)] = vInt;
-            singleChecks[typeof(double)] = vDouble;
-            singleChecks[typeof(DateTime)] = vDateTime;
-            singleChecks[typeof(Location)] = vLocation;
-            singleChecks[typeof(TimeSpan)] = vTimeSpan;
-
-            foreach (var kv in singleChecks)
-            {
-                Assert.AreEqual(
-                    true,
-                    DSCore.Data.IsSupportedDataNodeDynamoType(kv.Value, kv.Key.ToString(), false),
-                    String.Format($"Couldn't validate {kv.Key} input."));
-            }
-
-            // Assert - check list - fail
-            var validate = DSCore.Data.IsSupportedDataNodeDynamoType(vStringList, typeof(string).ToString(), false);
-            Assert.AreEqual(false, validate, "Shouldn't validate list values with list flag off.");
-
-            validate = DSCore.Data.IsSupportedDataNodeDynamoType(vString, typeof(string).ToString(), true);
-            Assert.AreEqual(false, validate, "Shouldn't validate single values with list flag on.");
-
-            validate = DSCore.Data.IsSupportedDataNodeDynamoType(invStringList, typeof(string).ToString(), true);
-            Assert.AreEqual(false, validate, "Shouldn't validate heterogenous list input.");
-
-            // Assert - check homogenous list values - succeed
-            var listChecks = new Dictionary<Type, object>();
-            listChecks[typeof(string)] = vStringList;
-            listChecks[typeof(int)] = vIntList;
-            listChecks[typeof(double)] = vDoubleList;
-            listChecks[typeof(DateTime)] = vDateTimeList;
-            listChecks[typeof(Location)] = vLocationList;
-            listChecks[typeof(TimeSpan)] = vTimeSpanList;
-
-            foreach (var kv in listChecks)
-            {
-                Assert.AreEqual(
-                    true,
-                    DSCore.Data.IsSupportedDataNodeDynamoType(kv.Value, kv.Key.ToString(), true),
-                    String.Format($"Couldn't validate {kv.Key} list input."));
-            }
-        }
-
-
-        [Test]
-        [Category("UnitTests")]
-        public void IsSupportedGeometryDataType()
-        {
-            // Single values and primitive composites
-            var point = Autodesk.DesignScript.Geometry.Point.ByCoordinates(1, 1, 1);
-            var point2 = Autodesk.DesignScript.Geometry.Point.ByCoordinates(2, 2, 1);
-            var point3 = Autodesk.DesignScript.Geometry.Point.ByCoordinates(3, 3, 3);
-            var vector = Vector.ByCoordinates(0, 0, 1);
-            var plane = Plane.ByBestFitThroughPoints([point, point2, point3]);
-            var vBoundingBox = BoundingBox.ByCorners(point, point3);
-            var vCoordinateSystem = CoordinateSystem.ByOrigin(0, 0);
-            var vSurface = Surface.ByPerimeterPoints([point, point2, point3]);
-            var vUV = UV.ByCoordinates(0, 0);
-            var vCurve = Curve.ByParameterLineOnSurface(vSurface, vUV, vUV);
-            var vArc = Arc.ByThreePoints(point, point2, point3);
-            var vCircle = Circle.ByBestFitThroughPoints([point, point2, point3]);
-            var vEllipse = Ellipse.ByOriginRadii(point, 5, 5);
-            var vEllipseArc = EllipseArc.ByPlaneRadiiAngles(plane, 2, 2, 0, 180);
-            var vHelix = Helix.ByAxis(point, vector, point3, 1, 360);
-            var vLine = Line.ByBestFitThroughPoints([point, point2, point3]);
-            var vNurbsCurve = NurbsCurve.ByControlPoints([point, point2, point3, point]);
-            var vPolyCurve = PolyCurve.ByJoinedCurves([vCurve, vCurve], 0.001);
-            var vPolygon = Polygon.ByPoints([point, point2, point3, point]);
-            var vRectangle = Autodesk.DesignScript.Geometry.Rectangle.ByWidthLength(5, 10);
-            var indexGroup = IndexGroup.ByIndices(0, 1, 2);
-            var vMesh = Mesh.ByPointsFaceIndices([point, point2, point3], [indexGroup, indexGroup, indexGroup]);
-            var vSolid = Solid.ByJoinedSurfaces([vSurface, vSurface, vSurface, vSurface, vSurface, vSurface]);
-            var vCone = Cone.ByCoordinateSystemHeightRadii(vCoordinateSystem, 1, 1, 1);
-            var vCylinder = Cylinder.ByPointsRadius(point, point3, 1);
-            var vCuboid = Cuboid.ByCorners(point, point3);
-            var vSphere = Sphere.ByCenterPointRadius(point, 1);
-            var vNurbsSurface = NurbsSurface.ByControlPoints([[point, point2, point3, point],
-                [point, point3, point2, point],
-                [point2, point3, point, point2]], 2, 2);
-            var vPolySurface = PolySurface.ByJoinedSurfaces([vSurface, vSurface]);
-
-            // Lists
-            var invBoundingBoxList = new ArrayList() { point, vBoundingBox };
-            var vBoundingBoxList = new ArrayList() { vBoundingBox, vBoundingBox };
-            var vCoordinateSystemList = new ArrayList() { vCoordinateSystem, vCoordinateSystem };
-            var vPointList = new ArrayList() { point, point };
-            var vVectorList = new ArrayList() { vector, vector };
-            var vPlaneList = new ArrayList() { plane, plane };
-            var vSurfaceList = new ArrayList() { vSurface, vSurface };
-            var vUVList = new ArrayList() { vUV, vUV };
-            var vCurveList = new ArrayList() { vCurve, vCurve };
-            var vArcList = new ArrayList() { vArc, vArc };
-            var vCircleList = new ArrayList() { vCircle, vCircle };
-            var vEllipseList = new ArrayList() { vEllipse, vEllipse };
-            var vEllipseArcList = new ArrayList() { vEllipseArc, vEllipseArc };
-            var vHelixList = new ArrayList() { vHelix, vHelix };
-            var vLineList = new ArrayList() { vLine, vLine };
-            var vNurbsCurveList = new ArrayList() { vNurbsCurve, vNurbsCurve };
-            var vPolyCurveList = new ArrayList() { vPolyCurve, vPolyCurve };
-            var vPolygonList = new ArrayList() { vPolygon, vPolygon };
-            var vRectangleList = new ArrayList() { vRectangle, vRectangle };
-            var vMeshList = new ArrayList() { vMesh, vMesh };
-            var vSolidList = new ArrayList() { vSolid, vSolid };
-            var vConeList = new ArrayList() { vCone, vCone };
-            var vCylinderList = new ArrayList() { vCylinder, vCylinder };
-            var vCuboidList = new ArrayList() { vCuboid, vCuboid };
-            var vSphereList = new ArrayList() { vSphere, vSphere };
-            var vNurbsSurfaceList = new ArrayList() { vNurbsSurface, vNurbsSurface };
-            var vPolySurfaceList = new ArrayList() { vPolySurface, vPolySurface };
-
-            // Assert - check signle values - succeed
-            var singleChecks = new Dictionary<Type, object>();
-            singleChecks[typeof(BoundingBox)] = vBoundingBox;
-            singleChecks[typeof(CoordinateSystem)] = vCoordinateSystem;
-            singleChecks[typeof(Autodesk.DesignScript.Geometry.Point)] = point;
-            singleChecks[typeof(Vector)] = vector;
-            singleChecks[typeof(Plane)] = plane;
-            singleChecks[typeof(Surface)] = vSurface;
-            singleChecks[typeof(UV)] = vUV;
-            singleChecks[typeof(Curve)] = vCurve;
-            singleChecks[typeof(Arc)] = vArc;
-            singleChecks[typeof(Circle)] = vCircle;
-            singleChecks[typeof(Ellipse)] = vEllipse;
-            singleChecks[typeof(EllipseArc)] = vEllipseArc;
-            singleChecks[typeof(Helix)] = vHelix;
-            singleChecks[typeof(Line)] = vLine;
-            singleChecks[typeof(NurbsCurve)] = vNurbsCurve;
-            singleChecks[typeof(PolyCurve)] = vPolyCurve;
-            singleChecks[typeof(Polygon)] = vPolygon;
-            singleChecks[typeof(Autodesk.DesignScript.Geometry.Rectangle)] = vRectangle;
-            singleChecks[typeof(Mesh)] = vMesh;
-            singleChecks[typeof(Solid)] = vSolid;
-            singleChecks[typeof(Cone)] = vCone;
-            singleChecks[typeof(Cylinder)] = vCylinder;
-            singleChecks[typeof(Cuboid)] = vCuboid;
-            singleChecks[typeof(Sphere)] = vSphere;
-            singleChecks[typeof(NurbsSurface)] = vNurbsSurface;
-            singleChecks[typeof(PolySurface)] = vPolySurface;
-
-            foreach (var kv in singleChecks)
-            {
-                Assert.AreEqual(
-                    true,
-                    DSCore.Data.IsSupportedDataNodeDynamoType(kv.Value, kv.Key.ToString(), false),
-                    String.Format($"Couldn't validate {kv.Key} input."));
-            }
-
-            // Assert - check list - fail
-            var validate = DSCore.Data.IsSupportedDataNodeDynamoType(invBoundingBoxList, typeof(BoundingBox).ToString(), true);
-            Assert.AreEqual(false, validate, "Shouldn't validate heterogenous list input.");
-
-            // Assert - check homogenous list values - succeed
-            var listChecks = new Dictionary<Type, object>();
-            listChecks[typeof(BoundingBox)] = vBoundingBoxList;
-            listChecks[typeof(CoordinateSystem)] = vCoordinateSystemList;
-            listChecks[typeof(Autodesk.DesignScript.Geometry.Point)] = vPointList;
-            listChecks[typeof(Vector)] = vVectorList;
-            listChecks[typeof(Plane)] = vPlaneList;
-            listChecks[typeof(Surface)] = vSurfaceList;
-            listChecks[typeof(UV)] = vUVList;
-            listChecks[typeof(Curve)] = vCurveList;
-            listChecks[typeof(Arc)] = vArcList;
-            listChecks[typeof(Circle)] = vCircleList;
-            listChecks[typeof(Ellipse)] = vEllipseList;
-            listChecks[typeof(EllipseArc)] = vEllipseArcList;
-            listChecks[typeof(Helix)] = vHelixList;
-            listChecks[typeof(Line)] = vLineList;
-            listChecks[typeof(NurbsCurve)] = vNurbsCurveList;
-            listChecks[typeof(PolyCurve)] = vPolyCurveList;
-            listChecks[typeof(Polygon)] = vPolygonList;
-            listChecks[typeof(Autodesk.DesignScript.Geometry.Rectangle)] = vRectangleList;
-            listChecks[typeof(Mesh)] = vMeshList;
-            listChecks[typeof(Solid)] = vSolidList;
-            listChecks[typeof(Cone)] = vConeList;
-            listChecks[typeof(Cylinder)] = vCylinderList;
-            listChecks[typeof(Cuboid)] = vCuboidList;
-            listChecks[typeof(Sphere)] = vSphereList;
-            listChecks[typeof(NurbsSurface)] = vNurbsSurfaceList;
-            listChecks[typeof(PolySurface)] = vPolySurfaceList;
-
-            foreach (var kv in listChecks)
-            {
-                Assert.AreEqual(
-                    true,
-                    DSCore.Data.IsSupportedDataNodeDynamoType(kv.Value, kv.Key.ToString(), true),
-                    String.Format($"Couldn't validate {kv.Key} list input."));
-            }
-        }
-
-        [Test]
-        [Category("UnitTests")]
-        public void IsSupprtedInheritanceDataType()
-        {
-            // Primitives
-            var point = Autodesk.DesignScript.Geometry.Point.ByCoordinates(1, 1, 1);
-            var point2 = Autodesk.DesignScript.Geometry.Point.ByCoordinates(2, 2, 1);
-            var point3 = Autodesk.DesignScript.Geometry.Point.ByCoordinates(3, 3, 3);
-            var vector = Vector.ByCoordinates(0, 0, 1);
-            var plane = Plane.ByBestFitThroughPoints([point, point2, point3]);
-            var vCoordinateSystem = CoordinateSystem.ByOrigin(0, 0);
-            var vSurface = Surface.ByPerimeterPoints([point, point2, point3]);
-
-            // Curve
-            var vUV = UV.ByCoordinates(0, 0);
-            var vCurve = Curve.ByParameterLineOnSurface(vSurface, vUV, vUV);
-            var vArc = Arc.ByThreePoints(point, point2, point3);
-            var vCircle = Circle.ByBestFitThroughPoints([point, point2, point3]);
-            var vEllipse = Ellipse.ByOriginRadii(point, 5, 5);
-            var vEllipseArc = EllipseArc.ByPlaneRadiiAngles(plane, 2, 2, 0, 180);
-            var vHelix = Helix.ByAxis(point, vector, point3, 1, 360);
-            var vLine = Line.ByBestFitThroughPoints([point, point2, point3]);
-            var vNurbsCurve = NurbsCurve.ByControlPoints([point, point2, point3, point]);
-            var vPolyCurve = PolyCurve.ByJoinedCurves([vCurve, vCurve], 0.001);
-            var vPolygon = Polygon.ByPoints([point, point2, point3, point]);
-            var vRectangle = Autodesk.DesignScript.Geometry.Rectangle.ByWidthLength(5, 10);
-
-
-            var indexGroup = IndexGroup.ByIndices(0, 1, 2);
-            var vMesh = Mesh.ByPointsFaceIndices([point, point2, point3], [indexGroup, indexGroup, indexGroup]);
-
-            // Solid
-            var vSolid = Solid.ByJoinedSurfaces([vSurface, vSurface, vSurface, vSurface, vSurface, vSurface]);
-            var vCone = Cone.ByCoordinateSystemHeightRadii(vCoordinateSystem, 1, 1, 1);
-            var vCylinder = Cylinder.ByPointsRadius(point, point3, 1);
-            var vCuboid = Cuboid.ByCorners(point, point3);
-            var vSphere = Sphere.ByCenterPointRadius(point, 1);
-
-            // Surface
-            var vNurbsSurface = NurbsSurface.ByControlPoints([[point, point2, point3, point],
-                [point, point3, point2, point],
-                [point2, point3, point, point2]], 2, 2);
-            var vPolySurface = PolySurface.ByJoinedSurfaces([vSurface, vSurface]);
-
-            // Heterogeneous lists
-            var vCurveInheritanceList = new ArrayList() { vRectangle, vPolygon, vNurbsCurve, vEllipse };
-            var vPolyCurveInheritanceList = new ArrayList() { vRectangle, vPolygon, vPolyCurve };
-            var vSolidInheritanceList = new ArrayList() { vSolid, vCone, vCylinder, vCuboid, vSphere };
-            var vSurfaceInheritanceList = new ArrayList() { vNurbsSurface, vPolySurface };
-
-            var ivCurveInheritanceList = new ArrayList() { vRectangle, vPolygon, vNurbsCurve, vEllipse, vSphere };
-            var ivPolyCurveInheritanceList = new ArrayList() { vRectangle, vPolygon, vPolyCurve, vCurve };
-            var ivSolidInheritanceList = new ArrayList() { vPolygon, vCone, vCylinder, vCuboid, vSphere };
-            var ivSurfaceInheritanceList = new ArrayList() { vNurbsSurface, vPolySurface, vCylinder, vCuboid, vSphere };
-
-            // Assert - check single upward inheritence - succeed
-            var validate = DSCore.Data.IsSupportedDataNodeDynamoType(vRectangle, typeof(Curve).ToString(), false);
-            Assert.AreEqual(true, validate, "Couldn't vaidate Rectangle inheritance from Curve.");
-
-            // Assert - check single downward inheritance - fail 
-            validate = DSCore.Data.IsSupportedDataNodeDynamoType(vCurve, typeof(Autodesk.DesignScript.Geometry.Rectangle).ToString(), false);
-            Assert.AreEqual(false, validate, "Shouldn't vaidate Curve inheritance from Rectangle.");
-
-            validate = DSCore.Data.IsSupportedDataNodeDynamoType(vCone, typeof(Curve).ToString(), false);
-            Assert.AreEqual(false, validate, "Shouldn't vaidate Cone inheritance from Curve.");
-
-            // Assert - check heterogeneous list values - succeed
-            validate = DSCore.Data.IsSupportedDataNodeDynamoType(vCurveInheritanceList, typeof(Curve).ToString(), true);
-            Assert.AreEqual(true, validate, "Couldn't validate DataTypes inheriting from Curve in a heterogeneous list input.");
-
-            validate = DSCore.Data.IsSupportedDataNodeDynamoType(vPolyCurveInheritanceList, typeof(PolyCurve).ToString(), true);
-            Assert.AreEqual(true, validate, "Couldn't validate DataTypes inheriting from PolyCurve in a heterogeneous list input.");
-
-            validate = DSCore.Data.IsSupportedDataNodeDynamoType(vSolidInheritanceList, typeof(Solid).ToString(), true);
-            Assert.AreEqual(true, validate, "Couldn't validate DataTypes inheriting from Solid in a heterogeneous list input.");
-
-            validate = DSCore.Data.IsSupportedDataNodeDynamoType(vSurfaceInheritanceList, typeof(Surface).ToString(), true);
-            Assert.AreEqual(true, validate, "Couldn't validate DataTypes inheriting from Surface in a heterogeneous list input.");
-
-
-            // Assert - check invalid heterogeneous list values - fail
-            validate = DSCore.Data.IsSupportedDataNodeDynamoType(ivCurveInheritanceList, typeof(Curve).ToString(), true);
-            Assert.AreEqual(false, validate, "Shouldn't validate DataTypes inheriting from Curve if there is a Sphere in the list input.");
-
-            validate = DSCore.Data.IsSupportedDataNodeDynamoType(ivPolyCurveInheritanceList, typeof(PolyCurve).ToString(), true);
-            Assert.AreEqual(false, validate, "Shouldn't validate DataTypes - Curve does not inherit from PolyCurve.");
-
-            validate = DSCore.Data.IsSupportedDataNodeDynamoType(ivSolidInheritanceList, typeof(Solid).ToString(), true);
-            Assert.AreEqual(false, validate, "Shouldn't validate DataTypes inheriting from Solid if there is a Polygone in the list input.");
-
-            validate = DSCore.Data.IsSupportedDataNodeDynamoType(ivSurfaceInheritanceList, typeof(Surface).ToString(), true);
-            Assert.AreEqual(false, validate, "Shouldn't validate DataTypes inheriting from Surface with Cylindar, Cuboid and Sphere in the list.");
+            Assert.That(() => DSCore.Data.Remember(unsupportedInput, validCachedJson), Throws.Exception);
         }
     }
 }
diff --git a/test/Tools/docGeneratorTestFiles/TestMdOutput_CoreNodeModels/CoreNodeModels.DefineData.md b/test/Tools/docGeneratorTestFiles/TestMdOutput_CoreNodeModels/CoreNodeModels.DefineData.md
deleted file mode 100644
index 54f2d1fcb9a..00000000000
--- a/test/Tools/docGeneratorTestFiles/TestMdOutput_CoreNodeModels/CoreNodeModels.DefineData.md
+++ /dev/null
@@ -1,5 +0,0 @@
-## Define Data - Documentation
-
-This documentation file is auto generated by NodeDocumentationMarkdownGenerator, Version=2.13.0.2212, Culture=neutral, PublicKeyToken=null.
-
-For more information about adding documentation to nodes see https://github.com/DynamoDS/Dynamo/wiki/Create-and-Add-Custom-Documentation-to-Nodes
diff --git a/test/Tools/docGeneratorTestFiles/sampledictionarycontent/Dynamo_Nodes_Documentation.json b/test/Tools/docGeneratorTestFiles/sampledictionarycontent/Dynamo_Nodes_Documentation.json
index cef5a1e29ea..b85ceddc4a7 100644
--- a/test/Tools/docGeneratorTestFiles/sampledictionarycontent/Dynamo_Nodes_Documentation.json
+++ b/test/Tools/docGeneratorTestFiles/sampledictionarycontent/Dynamo_Nodes_Documentation.json
@@ -4354,11 +4354,5 @@
     "dynFile": ["Gate"],
     "folderPath": "Script/Control Flow/Action",
     "inDepth": "Block data passing through this node to downstream nodes. Node returns the input data only if the node value is set to Open.\n\nIn Generative Design workflows, this node should be used to control and block the behavior of nodes that will place elements in Revit"
-}, {
-     "Name": "DefineData",
-     "imageFile": ["DefineData"],
-     "dynFile": ["DefineData"],
-     "folderPath": "ImportExport/Data/Action",
-     "inDepth": "Validates and returns data from a currently or previously connected node."
 }
 ]
diff --git a/test/settings/DynamoSettings-NewSettings.xml b/test/settings/DynamoSettings-NewSettings.xml
index 3b25ca29293..1a3d5ce827e 100644
--- a/test/settings/DynamoSettings-NewSettings.xml
+++ b/test/settings/DynamoSettings-NewSettings.xml
@@ -40,7 +40,6 @@
   <BackupFiles>
     <string>C:\Users\user\Documents\dynamofile.dyn</string>
   </BackupFiles>
-  <TemplateFilePath>C:\ProgramData\Dynamo\Dynamo Core\templates\en-US</TemplateFilePath>
   <CustomPackageFolders>
     <string>%BuiltInPackages%</string>
     <string>C:\Users\user\AppData\Roaming\Dynamo\Dynamo Core\2.16</string>