Cleaning up for Node but still not functional