remove simple_form, rewrite match form 539