CLOUDIFY-1595 remove unused imports
CLOUDIFY-1595 fix checkstyle and imports