NewNode/NewNode2 cleanup