Nixed some cruft.