Removed some unused cruft.