bits of cleaning up
new nightly infers lifetimes