Clean up for official rev.