final clean up of node best practices