Clean-up

Removed index2