Fixed "IntelliJ Optimize imports" bugs