cleanup istr model in preparation for new models