Rename index_counter
Remove commented code