fixed module macro calls and removed deprecated stubs