cleanup for size
Fixing PR14478