Commented add-plot out, and removed debugging code