Even more cleanup, onto flows...