r161: More clean-up