Great point.  Will do a PR to remove these from all central server code after this one is merged.