Removed unused cruft.