remove uneeded closures