Clean up counters in CS
Refactor all the things