STY: remove unneeded cruft