incomplete refactoring of some selectors and callbacks into FormControl instances