merge fix: delete refs to count_required and count_done