cleanup unnecessary lifetime code