Removing cruft, etc.