A bit more cosmetic cleanup, removing old junk.