HH remove TARGET_PRODUCT from here