Made plotting path conditionally controlled by PLOT_PATH
Disable the direct path for now.
Cleanups