Groovy cleanup