More removal of SET references