Token cleanup