Extend cleanup script
Add remove_by_idx script