cleanup, preparing to merge nodes and popup