Cleanup + Fig1 data