removing some HPCS specific code.