Got rid of some models