frigate/form: cleanup