callbacks_cleanup bugfix