CLOUDIFY-1705 Removed dead code