minor refactoring.  also, remove control to delete random node.