CLOUDIFY-2449 code cleanup