Moved CodeToken delete to an earlier point in time
Merge branch 'Microsoft-JWT'