Remove (some) use of groovy in src/main