More clean-up, slowly separate app state concerns.