===> Cleaning for queue-fix-1.4