Added indexes
Revert "Added indexes"

This reverts commit 2c8bd21fef7472a42d44122f60c9f3781c575b2d.