[Hooks] More cleaning.