fixup cruft