Right, though I'd say we probably need the cleanup rake task then if we're removing this.  Not that a token is particularly expensive.