[CLEANUP] Drop more unused functions.
[CLEANUP] Organize imports.
[CLEANUP] Convert another Iterator loop to a for each loop.