CLOUDIFY-2423-remove-unused-riemann-code