doing it
removing module hooking
fixing after rebase