Remove a bunch more IO specific stuff