PLOT: plot-class clean-up - removed old stuff
PLOT: plotting-class clean-up - rem. old stuff