Remove usage of removed hooks

Change-Id: I37d79b61578a273c4c798f5d3663acb6ecb42e31
Merge "Remove usage of removed hooks"