I think this whole lambda section can be removed.