Cleaning up index still