Remove the gnuplot stuff
Move around