Bumped groovy version and removed unused code