getting rid of some cruft