cleanup dagepzsir form code