Deleting unused imports and useless comment