Remove/sort usings