Remove plotting
Cleanup