Removing HSCC-specific code