Remove Ophan logic