Keeping imports and removing unused comment.