Latest code cleanup for plot4 and plot 4 image