removed references to old tables