Remove remaining fixes as all pushed upstream to opal