clean up a bit of callbacks cruft