GRAILS-11056 - cleanup imports left over from class refactoring