Remove unnecessary closures