Cleaned out cruft.