Remove pre-buff calls