added map_remove_if