General cleanup and filer form work.