Added token type as part of the key on the Token entity to improve performance (we always query on both key and token type so it makes sense to have the token type as part of the clustered index)
Also cleaned up a few unnecessary "using"