clean up and added callback functions
re-retried cleanup