Remove Store main tables in favor of a single main table