Once all our users have upgraded to the latest clients they won’t need this. The latest clients only use the combined key and service ID. Discuss: when can we safely remove it?