51925771 Remove obsolete table and model, update related tests.