Minor cleanup
Upgrade to commons-io 2.4