Remove use of commons-io