Cosmetic: eliminate leftovers