finished the remove_by feature