Removed old cruft.