Tidy up. Romove the cruft.