Did all sorts of cleanup by simplifying callback references