[MIN] remove unused code
[MIN] Cleanups (inspired by IntelliJ inspections)