take out some cruft