Code cleanup - replace helper patch with deface override