Remove and sort usings.
Merge pull request #5658 from RoosterDragon/formatting-cleanup

Remove & sort usings