Removing unused code and have counters properly reflect server data