Remove shadowed lifetime