Improve new _oasis
Remove useless code