clean up of new node addition code