#77 Table consolidate rules, remove schema