Cleanup Wikibase hooks

Change-Id: I24478fe37fa3e8b8a3a24f9903a8b96b20136619
Merge "Cleanup Wikibase hooks"