CLOUDIFY-1606 removed non-relevant changes