More removal of obsolete SET