[MIN] IntelliJ inspections
[MIN] Visibility issues
[MIN] old code removed