more refund cleaning (bug 1026283)