Cleanup formfield round 1