Removed unneeded cruft.