New models (to be imroved), useless code removed