more cleaning, leaving only entries