removed a couple dpm() functions