feat: stripping indexes and adding them later, and testing

feat: stripping indexes and adding them later, and testing #647