Fillform cleanup