More Groovy eradication.