Remove module context hook
Fix router