cleanup output, maintain merged $data