Further lifetime cleanup