remove some unused cruft