Finish converting all plots to be context managed