Remove Static Counter

* Remove static counter