Cleaned up some old simple_form stuff