removing more exportto - clean Tp level namespace (p3)