Some cleaup of models