Adding message queue cleanup