clean up pointerisms

[#84438238]