Removing a few leftover closures