remove extra and unneeded closures.
Merge pull request #4311 from stefanpenner/reduce-closures

remove extra and unneeded closures.