Cleaning some cruft