simplify persistent teams system a bit