remove single node walk
add multiple singletons