Merge branch '2095-review-and-possibly-remove-unused-tables-2' into 'main'

Resolve "Review and possibly remove unused tables", part 02

Closes #2095

See merge request !2984