VIVO-773 continue clean up of model makers