APPS: Remove all traces of special SM2 treatment.