**Draft** Fix one to one assumption

This is very drafty and not meant as a true PR submission. All of the unit tests are passing except the ones related to rescanning. I am stumped..I can't figure out why the call index isn't getting cleared out on rescans. I was curious if you had any thoughts on what could be causing the issue.