Removing NODE_PATH
Merge branch 'refactor/remove-node-path'