Concerning #792: IOScheme - cleanup