AMQP-294 Remove Class Tangle