Removed last IO references, preserving the class