Get rid of opal dependency