More plots and removed last bit of testing code