Callbacks are now mandatory; clean up