Great. You should update this pull request to remove the callbacks, too.