Removing groovy deprecations