Re: [PATCH 0/9] Clean up some old patches post F31