Remove remaining HP references