Remove some (now) unnecessary changes

Reverting the rename cnt -> afn_cnt as this is no longer necessary.