Fix archive and delete