51925771 Removed obsolete model, fixed associated behave tests.