Revert "Added index tracking"

This reverts commit 103052aa0fb8c32ad71d43a710e2d25763b55efa.