Remove module name from calls within the module