Switched to IntelliJ IDEA + imports cleanup