MX-1216 removed more model cruft that slipped through