removing dsm() calls