fix infinite loop bug identified by Jeremy.
Remove TODO that was already done.