Deleting old cruft and updating comments