Cleaning up callback handling as well