initial work on callbacks_cleanup