Remove unneeded lambdas