Draft: Resolve "Clean up unnecessary foreign keys"
Description
[Describe changes/solution; problem description should be in issue]
Notes to review (code/docs/QA)
Related issues
Closes #2291
[Describe changes/solution; problem description should be in issue]
Closes #2291