Got rid of AppModel