changed the datasource and removed references to deleted models