cleaning some cruft