remove closures from code