Remove unused hook.
Simplifie call logic.
Simplify variables scope.