Removed some old cruft.