Cleanup to amq-consumer template