Removed database stuff from Plotting