Remove unused files
More removal of SET references