removed more -sname cruft