Get rid of APIModel (14 tests failing).