Remove hooks.

The use case for these hooks disappeared. As they are no longer
required, removing.

Change-Id: I2de19bfee909751fea5ab1c1ad839868db6314ff