feat: stripping indexes and adding them later, and testing (#273)

feat: stripping indexes and adding them later, and testing (#273) #90