CLOUDIFY-1993 Eliminated deprecated code.