Remove usage of  in closures