Simplify removeFinished method