Groovy Clean Up