removing unneeded cruft