refactoring to use new version of kombu