clean up + add a iterator of shards