remove soon to be obsolete model stuff