Remove node-namespace and clean up class cruft