Migrate to simpler tables

11 jobs for use-list-tables in 14 minutes and 39 seconds (queued for 3 seconds)