Cleanup

Removed unused usings