Get rid of our fork and updated to 0.24 which contains some improvements

Wrapped some coredata API calls inside the `performBlockAndWait`