improved generation of remove_list