Remove legacy tables detailed in #1830