Cleanup and fix errors
Update Groovy dependency in pom.xml