Node cleanup

Uses "normal" interation without the lambda to prevent another object in the stack.

removed unused code.