Remove unused hooks

Change-Id: I6210e7c9108c1e328a8dda60b9eb7a72b4f48022
Merge "Remove unused hooks"