Cleaned up unwanted references to MQContentModel.