Removed #define BUILDING_NODE_EXTENSION
Lots of code cleanup