some formbuilder cleanup