Fixed a mistake and removed unused imports