Remove patch client from a-mq as well