remove some cruft