Removed hp constructor calls