Removing unused line and redundant comment.
Redo all the imports since IntelliJ was starring