Looks like @ctweney might have missed this comment in the midst of all that refactoring, @christianv . What happens between getting a CalNet ID & having data in our DB views is an interesting question (we hit a similar situation with CLC-3109 / CLC-3019), but it doesn't have anything to do with this PR. All the deleted code is already a no-op thanks to "Settings.features.user_whitelist" being false. So I'm going to go ahead and merge this hanging PR.