Removed dependencies on commons-io