Unify tokens cleanup