Purge usage of removed ModelChoice