remove deprecated norm calls
add element wise max(dv, s) etc.