Remove unused iterators, fix 3 sprintf calls' formatting.

Just general cleanup