fixing cruft