Update cloudify properties. Remove unused code blocks.