remove obsolete parameters
use a global lambda value
remove old code