Getting rid of cruft.