drop ev refactor
ocean refactors