RF: Clean out some cruft.