More output cleaning