HTC 10 Retail MODE

Can someone help me to remove retail mode from HTC 10 permanently?
i've root and freezed both demo apks but whenever i flash the new ROM or RUU, They eventually come back right after start.

from xda-developers http://ift.tt/1NVFmh0
via IFTTT