More work on deleting tokens