CLOUDIFY-2531 code cleanup