Remove extraneous lifetimes