some cleaning in mq