remove todos; add currentCount