Ocean2: Yet more clean up.