Removed state_count
Adding state_count was premature and really showed no benefit
since it was halfway implemented