node_selector cleanup