Update TODO and remove marginal_plots_en