Remove dependency on Apache commons-io