[TASK] Remove redundant hooks

Change-Id: I73a625b71fa0cd9e242017f65d2157e8ec54cfd8