removing unnecessary wrapper class in harplus