ridding more vagrant cruft