Cleaned up in MessageQueueService