Revive usage-cleaning
More IO-related substitutions