Cleanup: util/file unit