remove code for old FormBuilder