Cleanup code no changes needed for new callback format.