removed cruft