EDDC-359 #time 5m Removing unnecessary dpm() invocations