AW-1685 #comment clean up, rm views dynamic fields (broken)