`for i` cleanup

Cleaned up some unused indices.