Remove old ZipArchive, clean up Filesystem a bit