Cleanup with Commons-IO