Remove old code - token count