cleanup and more nodes