Removed excess dpm calls