Removed unused usings & code