removed references to old context and models