Update to 2.1.0-RC3
Some cleanup (fix warnings, IntelliJ inspections)