Merge "Hooks: remove some unnecessary code"