Support non-ManyArray model removal