remove some older cruft