Move temporary file cleanup to better place, remove a redundant saveBackup() call.