removed more unneeded code from xlambda