Removing more unnecessary cruft