Remove external call of module function