Merge "Remove some unused hooks from hooks.txt"