Merge "Remove some usages of IoUtil methods"