CLOUDIFY-1944 remove unused code
CLOUDIFY-1944 remove unused imports