More removal of set_ …