Removed unnecessary lifetimes