Code Review: Get rid of cruft.