remove some closures in fp