Remove ForSelect associations
Refactor grouped_options