Remove the dependency on Apache commons-io