remove unneeded cruft