Fixed some unused imports and comments.