Added queue cleaning