[Intellij] Remove redundant code constructs