Removing a few more leftover closures