Ocean2: Some more clean up.