groovy.lang cleanup (most important)