Some cleanups for rabbitmq support.