Remove the Oj dependency