Merge "Delete stale commented out declarations."