Removing a few leftover closures
Merge branch 'develop'