removed crap model
Merge branch 'master' into dev-swittli2