remove more spurios set_model calls