Remove "_type" from Model