Got rid of cruft.