some cruft removal