TODO comment cleanup.