Code cleanup: removed unused imports
Added a package for Groovy