Removing more unused code