model: removing ModelWithContext, as it is no longer used