remove some closures