Legacy Promotion Removal: Model layer