deprecated unset_hook and set_hook / cleanup
5 files changed