remove compute_form_data uses