Round of one of io cleanup