CLOUDIFY-2525 code cleanup