IntelliJ cleanup