remove some more MQ-specific stuff