Revert "Code clean up for the core langauge"

Reverts DynamoDS/Dynamo#2078