Tidy up. Remove the cruft.