remove more code dependent on the old tables.go