cleaning up and supporting older groovy builds