Remove reliance on deprecated haikro api