Remove unused using statements
Sort usings.
Merge branch 'remove-unused-usings'
Fix build break due to using being removed that was actually used.