Removed unused usings and files