import/comment cleanup