Remove some unnecessary XXXs.