Cleaned up the MQ utilities.