Get rid of cruft. <Sam/>