More removal of SET references and general clean up