Removed some unneeded tracking/counting