Removed unused usings
Clean up