Remove some closures