Adjust comments, remove useless imports