Clean up usings

Removed unused usings and sort them