WIP: Adding a call map_polys_with_index() to the clean command for now