Got rid of unused imports
Added a missing import