removed dpm or debug statements