Also remove some unused imports and a somewhat irrelevant comment.
Attach a file by drag & drop or click to upload
