Cleaning closures to improve performance