Counters: remove unused code
Counters: more unused code removal