RF: Get rid of this cruft.