Remove remaining references to HSS_ENABLED