IDE and gradle changes
Move away from Groovy

Use Google Guava instead.
Drop @OnlyIf