Fixing unused imports and comments.