CLOUDIFY-2454 fixed assertion in sanity and removed unused code