changed models, removed some unnecessary apps