Hooks registration clean-up

Change-Id: I73573a9b14ed159193d3c07b49565a9c97f1c5c5