start to remove anonymous closures