CLOUDIFY-2245 removed TODO comment.