groovy

Groovy 3.0 code clean up (including breaking changes in the API)