Remove dead code, clean up Oasis