Changes for removing hooks as well