update models, remove simple ones