Fix multiple cleanup messages, BZ 524633