more cleanup from removing simple_form