some cruft cleanup