Sort and remove usings
Merge pull request #2560 from ogail/s2

Sort and remove usings