Organized and removed unused usings