mq cleanups