HookController cleanup