Continue cleaning up the mess that is WHO