remove isFinished