Removing hooks

Change-Id: I6ab4ede76195293672d632431c5e084b204b6165