Instance versions of models, removed some old comments