Cleanup + Fig1