PMO-2441 remove old Model
PMO-2441 remove old Model