Remove oasis dependence