Let's get rid of this old cruft.