further cleanup of rabbitmq-c