Changes to index-clean
merges hadnled