DDBNEXT-992 remove unused imports
DDBNEXT-992 remove unused variables
DDBNEXT-994 resolving sonar violation "unused private method"
some of them were actually used, as private methods aren't really
private in groovy, see http://jira.codehaus.org/browse/GROOVY-1875
Merge branch 'DDBNEXT-992' into develop