Model deprecation / consolidation