Add todo for lambdas, remove debug logging