macros removing closures