adapting fluid strain to u_phi = 0

+ some tidying up of stuff not used anymore