Cleanup to adapt new model names and functions...